Changeset 23941 for main/trunk/greenstone3

Timestamp:

2011-04-21T14:59:26+12:00 (13 years ago)

Author:

ak19

Message:

Need to use GNUwin32 port of linux Which cmd instead of DOS Where cmd since Where is not available on Windows XP.

File:

• main/trunk/greenstone3/build.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -580 +580 @@
             </exec>
 
-        <exec executable="where" os="${os.windows}" spawn="false" outputproperty="full.perl.path">
+            <!-- DOS semi-equivalent of Linux which is "where" which returns lines of matches.
+            Use ant string functions to grab just the first line returned by the DOS where command. 
+            Sadly, "where" is not supported by winXP. Using GNUwin32 port of Linux "which" instead.-->
+            <!--<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>
+            </if>-->
+            <exec executable="${gs2build.home}/bin/windows/which" os="${os.windows}" spawn="false" outputproperty="full.perl.path">
+              <arg value="perl" />
+            </exec>
 
             <stringutil string="${full.perl.path}" property="perl.path">
                 <replace regex="\/[^\/]*$" replacement="" />
             </stringutil>
-
             <if><bool><istrue value="${current.os.isunix}"/></bool>