Changeset 31121

Show
Ignore:
Timestamp:
17.11.2016 13:44:47 (3 years ago)
Author:
kjdon
Message:

to get online document editing to work, gs3-setup.sh needs to be sourced/run before starting tomcat otherwise incremental-rebuild cannot find buildcol.pl. There was a test in init for this, commented out ages ago as releasekit stuff didn't like it. We have put this test into its own target which gets called when running 'ant start'.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r30884 r31121  
    666666    <echo>is windows : ${current.os.iswindows}</echo> 
    667667    <echo>os.unix: ${os.unix}</echo> 
     668  </target> 
     669 
     670  <target name="needs-gs3-setup"> 
     671    <!-- has the gs3-setup script been run?? --> 
     672    <condition property="gs3-setup-not-done"> 
     673      <not> 
     674    <isset property="env.GSDL3HOME"/> 
     675      </not> 
     676    </condition> 
     677 
     678    <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source gs3-setup.sh' (Linux/Mac) before starting the Greenstone server."/> 
    668679  </target> 
    669680 
     
    905916  </target> 
    906917 
    907   <target name="start" depends="init,configure-tomcat,configure-web,configure-solr-ext,start-derby,start-tomcat" 
     918  <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,start-derby,start-tomcat" 
    908919    description="Startup the Tomcat server." > 
    909920    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>  
     
    985996  <!-- this sets up some initial properties --> 
    986997  <target name="init"> 
    987  
    988     <!-- has the gs3-setup script been run?? --> 
    989     <condition property="gs3-setup-not-done"> 
    990       <not> 
    991     <isset property="env.GSDL3HOME"/> 
    992       </not> 
    993     </condition> 
    994  
    995     <!--<fail if="gs3-setup-not-done" message="please run 'gs3-setup' (Windows) or 'source gs3-setup.sh' (Linux/Mac) before running this target."/>--> 
    996998     
    997999    <condition property="java.too.old">