Changeset 23896

Timestamp:

2011-04-11T17:16:13+12:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the missing full.perl.path variable when on windows.

File:

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

main/trunk/greenstone3/build.xml

@@ -574 +574 @@
           <else>
             <echo>
-  Using PATH enviroment variable to locate Perl.
+  Using PATH environment variable to locate Perl.
             </echo>
             <exec executable="which" os="${os.unix}" spawn="false" outputproperty="full.perl.path">
@@ -580 +580 @@
             </exec>
 
+        <exec executable="where" os="${os.windows}" spawn="false" outputproperty="full.perl.path">
+              <arg value="perl" />
+            </exec>
+
+            <if><bool><istrue value="${current.os.iswindows}"/></bool>
+              <stringutil string="${full.perl.path}" property="full.perl.path">
+                <replace regex="[\n].*$" replacement="" />
+              </stringutil>
+        </if>
+
             <stringutil string="${full.perl.path}" property="perl.path">
-              <replace regex="\/[^\/]*$" replacement="" />
+                <replace regex="\/[^\/]*$" replacement="" />
             </stringutil>
 
-            <if><bool><not><equals arg1="${full.perl.path}" arg2="/usr/bin/perl"/></not></bool>
-              <echo>
+            <if><bool><istrue value="${current.os.isunix}"/></bool>
+
+              <if><bool><not><equals arg1="${full.perl.path}" arg2="/usr/bin/perl"/></not></bool>
+                <echo>
     Non-standard 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>
+                </echo>
+              </if>
             </if>
           </else>