Changeset 23941

Show
Ignore:
Timestamp:
21.04.2011 14:59:26 (9 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r23936 r23941  
    580580            </exec> 
    581581 
    582         <exec executable="where" os="${os.windows}" spawn="false" outputproperty="full.perl.path"> 
     582            <!-- DOS semi-equivalent of Linux which is "where" which returns lines of matches. 
     583            Use ant string functions to grab just the first line returned by the DOS where command.  
     584            Sadly, "where" is not supported by winXP. Using GNUwin32 port of Linux "which" instead.--> 
     585            <!--<exec executable="where" os="${os.windows}" spawn="false" outputproperty="full.perl.path"> 
    583586              <arg value="perl" /> 
    584587            </exec> 
    585  
     588             
    586589            <if><bool><istrue value="${current.os.iswindows}"/></bool> 
    587590              <stringutil string="${full.perl.path}" property="full.perl.path"> 
    588591                <replace regex="[\n].*$" replacement="" /> 
    589592              </stringutil> 
    590         </if> 
     593            </if>--> 
     594            <exec executable="${gs2build.home}/bin/windows/which" os="${os.windows}" spawn="false" outputproperty="full.perl.path"> 
     595              <arg value="perl" /> 
     596            </exec> 
    591597 
    592598            <stringutil string="${full.perl.path}" property="perl.path"> 
    593599                <replace regex="\/[^\/]*$" replacement="" /> 
    594600            </stringutil> 
    595  
    596601            <if><bool><istrue value="${current.os.isunix}"/></bool> 
    597602