Changeset 9890

Timestamp:

2005-05-17T10:27:53+12:00 (19 years ago)

Author:

kjdon

Message:

modified the gli-local and gli-external targets. now pass gsdlpath and gsdl3path env vars to the gli4gs3.sh/bat scripts - can find gsdl3 and gsdl, but still run the setup scripts

File:

• trunk/gsdl3/build.xml (modified) (1 diff)

trunk/gsdl3/build.xml

@@ -1089 +1089 @@
   </target>
   <target name="gli" description="Run the Greenstone Librarian Interface" depends="gli-local,gli-external">
+  </target>
+
+  <target name="gli-local" depends="init" if="gsdl2.islocal">
+    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux}" dir="${basedir}/gli" spawn="true">
+      <env key="gsdl3path" path="${basedir}"/>
+      <env key="gsdlpath" path="${basedir}/gs2build"/>
+    </exec>
+    <exec executable="${basedir}/gli/gli4gs3.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">
+      <env key="GSDL3PATH" path="${basedir}"/>
+      <env key="GSDLPATH" path="${basedir}/gs2build"/>
+    </exec>
     <echo>Running GLI from Ant means that you don't get to see any of the terminal output. If you have problems with GLI and want to see the output, please run the script gli4gs3.sh/bat from the gsdl3/gli directory.
     </echo>
   </target>
-
-  <target name="gli-local" depends="init" if="gsdl2.islocal">
-    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux}" dir="${basedir}/gli" spawn="true">
-      <env key="GSDLHOME" path="${basedir}/gs2build"/>
-      <env key="GSDL3HOME" value="${basedir}"/>
-    </exec>
-    <exec executable="${basedir}/gli/gli4gs3.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">
-      <env key="GSDLHOME" value="${basedir}/gs2build"/>
-      <env key="GSDL3HOME" value="${basedir}"/>
-    </exec>
-  </target>
   
   <target name="gli-external" depends="init" unless="gsdl2.islocal">
-    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux}" dir="${gsdl2.installed.path}/gli"/>
-    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.bat" os="${os.windows}" dir="${gsdl2.installed.path}/gli"/>
+    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux}" dir="${gsdl2.installed.path}/gli" spawn="true">
+      <env key="gsdl3path" path="${basedir}"/>
+      <env key="gsdlpath"  path="${gsdl2.installed.path}"/>
+    </exec>
+    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.bat" os="${os.windows}" dir="${gsdl2.installed.path}/gli" spawn="true">
+      <env key="GSDL3PATH" path="${basedir}"/>
+      <env key="GSDLPATH" path="${gsdl2.installed.path}"/>
+    </exec>
+    <echo>Running GLI from Ant means that you don't get to see any of the terminal output. If you have problems with GLI and want to see the output, please run the following in a terminal/command prompt: 
+                    (Linux              / Windows)
+in gsdl3 directory: source gs3-setup.sh / gs3-setup
+in gsdl directory:  source setup.bash   / setup
+in gli directory:   gli4gs3.sh          / gli4gs3
+    </echo>
   </target>