Changeset 35312

Timestamp:

2021-08-18T23:39:11+12:00 (3 years ago)

Author:

davidb

Message:

Technique that effectively allows us to 'source' our gs-setup.sh file added in. Written and tested for Linux; Windows version also added in, but not as yet tested

File:

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

main/trunk/greenstone3/build.xml

@@ -909 +909 @@
     <echo>is windows : ${current.os.iswindows}</echo>
     <echo>os.unix: ${os.unix}</echo>
-    <echo>env.PATH: ${env.PATH}</echo>
-    <echo>env.Path: ${env.Path}</echo>  
+    <echo>env.PATH: ${env.PATH}</echo>
+    <echo>env.Path: ${env.Path}</echo>  
   </target>
 
   <target name="needs-gs3-setup">
+
+    <exec os="${os.unix}" executable="bash"  dir="${basedir}" failonerror="true" output="${basedir}/gs3-setupenv.properties">
+      <arg value="-c" />
+      <arg value=". ./gs3-setup.sh >/dev/null 2>gs3-setupenv.errors ; env" />
+    </exec>
+    <exec osfamily="windows" executable="cmd" dir="${basedir}" failonerror="true" output="${basedir}/gs3-setupenv.properties">
+      <arg value="/c" />
+      <arg value=".\gs3-setup.sh >nul 2>gs3-setupenv.errors ; set" />
+    </exec>          
+    
+    <property file="${basedir}/gs3-setupenv.properties" prefix="env"/>
+
+    <!-- Delete the error output file if it is empty -->
+    <delete>
+      <fileset dir="${basedir}" includes="gs3-setupenv.errors">
+    <size value="0" when="equal"/>
+      </fileset>
+    </delete>
+
     <!-- has the gs3-setup script been run?? -->
     <condition property="gs3-setup-not-done">
@@ -923 +942 @@
     <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source ./gs3-setup.sh' (Unix) before starting the Greenstone server."/>
   </target>
+
+  <target name="needs-gs3-devel">
+
+    <exec os="${os.unix}" executable="bash"   dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
+      <arg value="-c" />
+      <arg value=". ./gs3-devel.sh >/dev/null 2>gs3-develenv.errors ; env" />
+    </exec>
+    <exec osfamily="windows" executable="cmd" dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
+      <arg value="/c" />
+      <arg value=".\gs3-devel.sh >nul 2>gs3-develenv.errors ; set" />
+    </exec>          
+
+    <property file="${basedir}/gs3-develenv.properties" prefix="env"/>
+
+    <!-- Delete the error output file if it is empty -->
+    <delete>
+      <fileset dir="${basedir}" includes="gs3-develenv.errors">
+    <size value="0" when="equal"/>
+      </fileset>
+    </delete>
+  </target>
+  
 
   <!-- Appends the current env to the file environment.txt. For debugging env vars used by the release-kit. -->