Changeset 10803


Ignore:
Timestamp:
2005-11-01T14:31:23+13:00 (18 years ago)
Author:
kjdon
Message:

upgraded to tomcat 5.5.12 (was 5.5.7), also need to call get-macos-extra when making a distribution for mac

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r10802 r10803  
    467467  <!-- this target sets up tomcat for the first time, or resets it any subsequent times -->
    468468  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
    469     <get src="http://www.greenstone.org/gs3files/jakarta-tomcat-5.5.7.zip"
    470       dest="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"
     469    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.12.zip"
     470      dest="${basedir}/comms/jakarta/apache-tomcat-5.5.12.zip"
    471471      usetimestamp="true"/>
    472472    <delete dir="${basedir}/comms/jakarta/tomcat.bak"/>
    … …  
    474474      <fileset dir="${basedir}/comms/jakarta/tomcat"/>
    475475    </move>
    476     <unzip src="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"
     476    <unzip src="${basedir}/comms/jakarta/apache-tomcat-5.5.12.zip"
    477477      dest="${basedir}/comms/jakarta"/>
    478478    <condition property="need.tomcat.compat">
    … …  
    481481    <antcall target="prepare-tomcat-compat"/>
    482482    <move todir="${basedir}/comms/jakarta/tomcat">
    483       <fileset dir="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7"/>
     483      <fileset dir="${basedir}/comms/jakarta/apache-tomcat-5.5.12"/>
    484484    </move>
    485485    <copy file="${basedir}/comms/jakarta/setclasspath.bat"
    … …  
    496496 
    497497  <target name="prepare-tomcat-compat" if="need.tomcat.compat">
    498     <get src="http://www.greenstone.org/gs3files/jakarta-tomcat-5.5.7-compat.zip"
    499       dest="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip"
     498    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.12-compat.zip"
     499      dest="${basedir}/comms/jakarta/apache-tomcat-5.5.12-compat.zip"
    500500      usetimestamp="true"/>
    501     <unzip src="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip"
     501    <unzip src="${basedir}/comms/jakarta/apache-tomcat-5.5.12-compat.zip"
    502502      dest="${basedir}/comms/jakarta"/>
    503     <copy file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7/common/endorsed/xml-apis.jar"
     503    <copy file="${basedir}/comms/jakarta/apache-tomcat-5.5.12/common/endorsed/xml-apis.jar"
    504504      tofile="${web.applet}/xml-apis.jar"/>
    505     <copy file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7/common/endorsed/xercesImpl.jar"
     505    <copy file="${basedir}/comms/jakarta/apache-tomcat-5.5.12/common/endorsed/xercesImpl.jar"
    506506      tofile="${web.applet}/xercesImpl.jar"/>
    507507  </target>
    … …  
    12761276   </target>
    12771277 
    1278  <target name="unzip-windows-packages" depends="init" if="current.os.iswindows"> 
     1278  <target name="unzip-windows-packages" depends="init" if="current.os.iswindows"> 
    12791279    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip"
    12801280    dest="${gs2build.home}/packages/windows/gdbm"/>
    … …  
    12841284    dest="${gs2build.home}/packages/windows/expat"/>
    12851285   </target>
    1286    <target name="get-macos-extra" depends="init" if="current.os.ismac">
     1286 
     1287  <target name="get-macos-extra" depends="init" if="current.os.ismac"> 
    12871288      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
    12881289      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
    12891290      usetimestamp="true"/>
    1290       <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
    1291          dest="${gs2build.home}/perllib/cpan/"
    1292      compression="gzip"/>
    1293    </target> 
     1291    <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
     1292      dest="${gs2build.home}/perllib/cpan/"
     1293      compression="gzip"/>
     1294    <delete file="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"/>
     1295  </target> 
     1296 
    12941297  <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/>
    12951298
    … …  
    14851488    <antcall target="get-windows-binaries"/>
    14861489    <antcall target="get-perl-for-windows"/>
     1490    <antcall target="get-macos-extra"/>
    14871491    <antcall target="prepare-mysql"/>
    14881492    <delete file="${packages.home}/mysql-standard-4.1.15-pc-linux-gnu-i686.tar.gz"/>
    … …  
    14941498    <delete file="${packages.home}/mysql/var/log/mysql.log"/>
    14951499    <antcall target="prepare-tomcat"/>
    1496     <delete file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"/>
    1497     <delete file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip"/>
     1500    <delete file="${basedir}/comms/jakarta/apache-tomcat-5.5.12.zip"/>
     1501    <delete file="${basedir}/comms/jakarta/apache-tomcat-5.5.12-compat.zip"/>
    14981502    <antcall target="configure-tomcat"/>
    14991503    <antcall target="prepare-axis"/>
Note: See TracChangeset for help on using the changeset viewer.