Changeset 36122


Ignore:
Timestamp:
2022-03-21T11:28:10+13:00 (2 years ago)
Author:
kjdon
Message:

on windows, need to use wget from bin/windows which is not in the path - use full path to it when calling it

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r36121 r36122  
    138138      <!-- possible that earlier versions of VS don't set this, so default to VS13 to trigger iconv-PRE-VS14.zip -->
    139139      <property name="visualstudio.majorversion" value="13"/>
     140    </else>
     141  </if>
     142
     143  <!-- on windows, we have downloaded wget into bin/windows, but its not on the path, so specify full path when calling it -->
     144  <if>
     145    <bool><isset property="current.os.iswindows"/></bool>
     146    <property name="wget" value="${basedir}/bin/windows/wget.exe"/>
     147    <else>
     148      <property name="wget" value="wget"/>
    140149    </else>
    141150  </if>
    … …  
    23542363
    23552364  <!-- ======================= Tomcat Targets ========================== -->
    2356  
     2365
    23572366  <!-- this target downloads and installs Tomcat -->
    23582367  <!-- we download tomcat (version 7 for Java 1.5 and later, version 5 for Java 1.4 plus the 1.4 compatibility package). -->
    … …  
    23822391    </exec>
    23832392    <else>
    2384       <exec executable="wget" failonerror="true">
     2393      <exec executable="${wget}" failonerror="true">
    23852394        <arg value="-P"/><!-- specifying output dir, also: minus-minus-directory-prefix -->
    23862395        <arg value="${packages.home}"/>
    … …  
    24122421      </exec>   
    24132422      <else>
    2414         <exec executable="wget" failonerror="true">
     2423        <exec executable="${wget}" failonerror="true">
    24152424          <arg value="-P"/>
    24162425          <arg value="${packages.home}"/>
    … …  
    29442953        usetimestamp="true"/>
    29452954      -->
    2946       <exec executable="wget" failonerror="true">
     2955      <exec executable="${wget}" failonerror="true">
    29472956    <arg value="-P"/>
    29482957    <arg value="${packages.home}"/>
    … …  
    30783087    </exec>
    30793088    <else>
    3080       <exec executable="wget" failonerror="true">
     3089      <exec executable="${wget}" failonerror="true">
    30813090        <arg value="-P"/><!-- output dir, alt: minus-minus-directory-prefix -->
    30823091        <arg value="${packages.home}"/>
Note: See TracChangeset for help on using the changeset viewer.