Changeset 35378


Ignore:
Timestamp:
2021-09-14T00:04:52+12:00 (3 years ago)
Author:
davidb
Message:

Downloading tomcat.zip and axis.zip targets adjusted to use 'curl' on a Mac, as this command-line tool is pre-installed, unlike wget which needs to be added in for tasks like 'ant install' to work from the get-go

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r35371 r35378  
    23132313  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal"
    23142314    description="downloads the appropriate version of Tomcat (Tomcat 5 if using Java 1.4, Tomcat 7 if using Java 1.5 or higher). If you want to change which version of Java you are using between 1.4 and 1.5/7 then you need to run prepare-tomcat">
    2315   <if>
     2315    <echo>Checking for existence of: ${packages.home}/tomcat/.flagfile</echo>
     2316    <if>
    23162317      <bool>
    23172318        <not><available file="${packages.home}/tomcat/.flagfile"/></not>
    … …  
    23252326        usetimestamp="true"/>
    23262327      -->
    2327       <exec executable="wget" failonerror="true">
    2328     <arg value="-P"/><!-- specifying output dir, also: minus-minus-directory-prefix -->
    2329     <arg value="${packages.home}"/>
    2330     <arg value="--no-check-certificate"/>
    2331     <arg value="${gsorg.root}/gs3files/${tomcat.version}.zip"/>
    2332       </exec>
     2328      <if>
     2329    <bool>
     2330      <os family="mac" />
     2331    </bool>     
     2332    <exec executable="curl" failonerror="true">
     2333      <arg value="-o"/>
     2334      <arg value="${packages.home}/${tomcat.version}.zip"/>
     2335      <arg value="${gsorg.root}/gs3files/${tomcat.version}.zip"/>
     2336    </exec>
     2337    <else>
     2338      <exec executable="wget" failonerror="true">
     2339        <arg value="-P"/><!-- specifying output dir, also: minus-minus-directory-prefix -->
     2340        <arg value="${packages.home}"/>
     2341        <arg value="--no-check-certificate"/>
     2342        <arg value="${gsorg.root}/gs3files/${tomcat.version}.zip"/>
     2343      </exec>
     2344    </else>
     2345      </if>
     2346
    23332347      <unzip src="${packages.home}/${tomcat.version}.zip"
    23342348             dest="${packages.home}"/>
    … …  
    23432357      usetimestamp="true"/>
    23442358      -->
    2345     <exec executable="wget" failonerror="true">
    2346       <arg value="-P"/>
    2347       <arg value="${packages.home}"/>
    2348       <arg value="--no-check-certificate"/>
    2349       <arg value="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"/>
    2350     </exec>
     2359
     2360    <if>
     2361      <bool><os family="mac" /></bool>     
     2362      <exec executable="curl" failonerror="true">
     2363        <arg value="-o"/>
     2364        <arg value="${packages.home}/${tomcat.version}-compat.zip"/>
     2365        <arg value="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"/>
     2366      </exec>   
     2367      <else>
     2368        <exec executable="wget" failonerror="true">
     2369          <arg value="-P"/>
     2370          <arg value="${packages.home}"/>
     2371          <arg value="--no-check-certificate"/>
     2372          <arg value="${gsorg.root}/gs3files/${tomcat.version}-compat.zip"/>
     2373        </exec>
     2374      </else>
     2375    </if>
     2376
    23512377    <unzip src="${packages.home}/${tomcat.version}-compat.zip"
    23522378      dest="${packages.home}"/>
    … …  
    29853011 
    29863012  <target name="prepare-axis" depends="init">
    2987 
     3013    <echo>Checking for existence of: ${packages.home}/axis/.flagfile</echo>
    29883014    <if>
    29893015      <bool>
    … …  
    29963022        usetimestamp="true"/>
    29973023      -->
    2998       <exec executable="wget" failonerror="true">
    2999     <arg value="-P"/><!-- output dir, alt: minus-minus-directory-prefix -->
    3000     <arg value="${packages.home}"/>
    3001     <arg value="--no-check-certificate"/>
    3002     <arg value="${gsorg.root}/gs3files/${axis.zip.version}"/>
    3003       </exec>
     3024      <if>
     3025    <bool>
     3026      <os family="mac" />
     3027    </bool>     
     3028    <exec executable="curl" failonerror="true">
     3029      <arg value="-o"/>
     3030      <arg value="${packages.home}/${axis.zip.version}"/>
     3031      <arg value="${gsorg.root}/gs3files/${axis.zip.version}"/>
     3032    </exec>
     3033    <else>
     3034      <exec executable="wget" failonerror="true">
     3035        <arg value="-P"/><!-- output dir, alt: minus-minus-directory-prefix -->
     3036        <arg value="${packages.home}"/>
     3037        <arg value="--no-check-certificate"/>
     3038        <arg value="${gsorg.root}/gs3files/${axis.zip.version}"/>
     3039      </exec>
     3040    </else>
     3041      </if>
     3042
    30043043      <unzip src="${packages.home}/${axis.zip.version}"
    30053044        dest="${packages.home}"/>
Note: See TracChangeset for help on using the changeset viewer.