Changeset 23852

Timestamp:

2011-04-05T15:27:16+12:00 (13 years ago)

Author:

davidb

Message:

Additional capability introduced to control how Perl is found.

1. if perl.path is set in build.properies then this is used ('perl' is concatenated on to the end)
2. failing that, if the environment variable PERLPATH is set this is used (again 'perl' is concatenated)
3. failing that, for Unix systems, 'which' is used to locate it on the path

File:

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

main/trunk/greenstone3/build.xml

@@ -79 +79 @@
        environment variable PERLPATH, and failing that assumes 'perl' 
        is on environment PATH -->
+
   <if><bool><isset property="env.PERLPATH"/></bool>
       <property name="perl.path" value="${env.PERLPATH}"/>
+  <else>
+     <echo>
+  Using PATH enviroment variable to locate Perl.
+    <exec executable="which"  spawn="false" outputproperty="full.perl.path">
+      <arg value="perl" />
+    </exec>
+    <echo>
+      <if><equals  arg1="${full.perl.path}" arg2="/usr/bin/perl" />
+    Non-stanard location of Perl found: ${full.perl.path}
+    Set the environment variable PERLPATH or the perl.path property in
+      build.properties to explicitly control the version of Perl used.
+    </echo>
+  </else>
   </if>
+
+<!--
+  <if><bool><isset property="perl.on.path"/></bool>
+    <propertyregex property="perl.path"
+          input="perl.on.path"
+          regexp=".*([^\/]*)"
+          select="\1" />
+  </if>
+-->
 
   <!-- full.perl.path is for pretty-printing only, e.g. used in target "start" -->
@@ -1460 +1483 @@
     </exec>
 
-    <!-- windows: just the java stuff. Calling without the "compile" argument first will run winMake.bat with "all" which will then perform both the compile AND link targets in jni/win32.mak (thereby also generating gdbmjava.dll). Then we run the same command with the "install" argument to copy the gdbmjava.dll into the correct location. -->
+    <!-- windows: Calling without the "compile" argument first will run winMake.bat with 
+         "all" which will then perform both the compile AND link targets in jni/win32.mak 
+         (thereby also generating gdbmjava.dll). Then we run the same command with 
+         the "install" argument to copy the gdbmjava.dll into the correct location. -->
     <echo>Windows: compile javagdbm</echo>
-    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true" />
     <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true">
-<!--      <env key="GSDLHOME" path="${gs2build.home}"/> -->
+      <env key="GSDLHOME" path="${gs2build.home}"/>
+    </exec>
+    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true">
+      <env key="GSDLHOME" path="${gs2build.home}"/>
       <arg value="install"/>
     </exec>