Changeset 31121

Timestamp:

2016-11-17T13:44:47+13:00 (7 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'.

File:

• main/trunk/greenstone3/build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.xml

@@ -666 +666 @@
     <echo>is windows : ${current.os.iswindows}</echo>
     <echo>os.unix: ${os.unix}</echo>
+  </target>
+
+  <target name="needs-gs3-setup">
+    <!-- has the gs3-setup script been run?? -->
+    <condition property="gs3-setup-not-done">
+      <not>
+    <isset property="env.GSDL3HOME"/>
+      </not>
+    </condition>
+
+    <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source gs3-setup.sh' (Linux/Mac) before starting the Greenstone server."/>
   </target>
 
@@ -905 +916 @@
   </target>
 
-  <target name="start" depends="init,configure-tomcat,configure-web,configure-solr-ext,start-derby,start-tomcat"
+  <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,start-derby,start-tomcat"
     description="Startup the Tomcat server." >
     <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 
@@ -985 +996 @@
   <!-- this sets up some initial properties -->
   <target name="init">
-
-    <!-- has the gs3-setup script been run?? -->
-    <condition property="gs3-setup-not-done">
-      <not>
-    <isset property="env.GSDL3HOME"/>
-      </not>
-    </condition>
-
-    <!--<fail if="gs3-setup-not-done" message="please run 'gs3-setup' (Windows) or 'source gs3-setup.sh' (Linux/Mac) before running this target."/>-->
     
     <condition property="java.too.old">