Changeset 10816 for trunk/gsdl3


Ignore:
Timestamp:
2005-11-02T12:25:50+13:00 (18 years ago)
Author:
kjdon
Message:

old packages has been disbanded. vishnu and gsdl-as now live in extensions, mg and javagdbm (andmgpp) now live in src/packages. mysql, tomcat, axis etc get downloaded into packages. comms is no more. build file updated to reflect these changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r10803 r10816  
    4848  <!-- get properties from the environment -->
    4949  <property environment="env"/>
     50  <property name="build.home" value="${basedir}/build"/>
    5051  <property name="src.home" value="${basedir}/src/java"/>
    51   <property name="build.home" value="${basedir}/build"/>
     52  <property name="src.packages.home" value="${basedir}/src/packages"/>
    5253  <property name="packages.home" value="${basedir}/packages"/>
     54  <property name="extensions.home" value="${basedir}/extensions"/>
    5355  <!-- this may be set in build.properties, eg if you move the web dir to
    5456  tomcats webapps directory -->
    … …  
    8082    </and>
    8183  </condition>
    82   <property name="catalina.home" value="${basedir}/comms/jakarta/tomcat"/>
     84  <property name="catalina.home" value="${packages.home}/tomcat"/>
    8385
    8486  <property name="os.linux" value="Linux"/>
    … …  
    113115  <property name="gs2build.home" value="${basedir}/gs2build"/>
    114116  <property name="gli.home" value="${basedir}/gli"/>
    115   <property name="vishnu.home" value="${packages.home}/vishnu"/>
    116   <property name="mg.home" value="${packages.home}/mg"/>
    117   <property name="mgpp.home" value="${packages.home}/mgpp"/>
    118   <property name="javagdbm.home" value="${packages.home}/javagdbm"/>
     117  <property name="vishnu.home" value="${extensions.home}/vishnu"/>
     118  <property name="mg.home" value="${src.packages.home}/mg"/>
     119  <property name="mgpp.home" value="${src.packages.home}/mgpp"/>
     120  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    119121  <property name="mysql.home" value="${packages.home}/mysql"/>
    120   <property name="gsdl-as.home" value="${packages.home}/gsdl-as"/>
    121 
     122  <property name="gsdl-as.home" value="${extensions.home}/gsdl-as"/>
     123
     124  <!-- can be set in build.properties if need be -->
    122125  <property name="mysql.datadir" value="./data"/>
    123126<!--  ==================== Compilation Control Options ==================== -->
    … …  
    168171    </fileset>-->
    169172   
    170     <!-- include the jar files from the packages -->
     173    <!-- include the jar files from the source packages -->
    171174    <!-- mg and mgpp get installed into lib/jni but they may not be there yet
    172175    so we add them in by name -->
    … …  
    217220  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
    218221
    219   <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web"
     222  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-extensions,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web"
    220223    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this."/>
    221224
    … …  
    223226    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
    224227 
    225   <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
     228  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-extensions,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
    226229    description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>
    227230
    228   <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building"
     231  <target name="configure-c++" depends="init,configure-packages,configure-core,configure-extensions,configure-gs2building"
    229232    description="Configure any C/C++ package code and gs2building code if necessary"/>
    230233 
    … …  
    232235    description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
    233236
    234   <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building"
     237  <target name="clean" depends="init,clean-packages,clean-extensions,clean-core,clean-gs2building"
    235238    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
    236239  <target name="clean-windows-c++" depends="init,clean-windows-c++-gs2building,clean-windows-c++-packages"
    237240    description="Remove C++ compiled code for Windows. Requires Microsoft Visual Studio"/>
    238241 
    239   <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
     242  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-extensions,compile-gs2building"
    240243    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
    241244 
    … …  
    319322    <fail if="java.too.old" message="You need Java 1.4 or greater to run Greenstone 3"/>
    320323   
    321     <available file="${basedir}/packages/mgpp/text" property="mgpp.present"/>
    322     <available file="${basedir}/packages/mysql/bin" property="mysql.present"/>
     324    <available file="${src.packages.home}/mgpp/text" property="mgpp.present"/>
     325    <available file="${packages.home}/mysql/bin" property="mysql.present"/>
    323326    <available file="${basedir}/gli" property="gli.present"/>
    324327    <available file="${basedir}/gs2build" property="gs2build.present"/>
    325     <available file="${basedir}/comms/soap/axis" property="axis.present"/>
    326328    <condition property="gsdl2.islocal">
    327329      <or>
    … …  
    468470  <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
    469471    <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.12.zip"
    470       dest="${basedir}/comms/jakarta/apache-tomcat-5.5.12.zip"
     472      dest="${packages.home}/apache-tomcat-5.5.12.zip"
    471473      usetimestamp="true"/>
    472     <delete dir="${basedir}/comms/jakarta/tomcat.bak"/>
    473     <move todir="${basedir}/comms/jakarta/tomcat.bak" failonerror="false">
    474       <fileset dir="${basedir}/comms/jakarta/tomcat"/>
     474    <delete dir="${packages.home}/tomcat.bak"/>
     475    <move todir="${packages.home}/tomcat.bak" failonerror="false">
     476      <fileset dir="${packages.home}/tomcat"/>
    475477    </move>
    476     <unzip src="${basedir}/comms/jakarta/apache-tomcat-5.5.12.zip"
    477       dest="${basedir}/comms/jakarta"/>
     478    <unzip src="${packages.home}/apache-tomcat-5.5.12.zip"
     479      dest="${packages.home}"/>
    478480    <condition property="need.tomcat.compat">
    479481      <equals arg1="1.4" arg2="${ant.java.version}"/>
    480482    </condition>
    481483    <antcall target="prepare-tomcat-compat"/>
    482     <move todir="${basedir}/comms/jakarta/tomcat">
    483       <fileset dir="${basedir}/comms/jakarta/apache-tomcat-5.5.12"/>
     484    <move todir="${packages.home}/tomcat">
     485      <fileset dir="${packages.home}/apache-tomcat-5.5.12"/>
    484486    </move>
    485     <copy file="${basedir}/comms/jakarta/setclasspath.bat"
    486       tofile="${basedir}/comms/jakarta/tomcat/bin/setclasspath.bat"
     487    <copy file="${packages.home}/tomcat-extra/setclasspath.bat"
     488      tofile="${packages.home}/tomcat/bin/setclasspath.bat"
    487489      overwrite="true"/>
    488     <copy file="${basedir}/comms/jakarta/setclasspath.sh"
    489       tofile="${basedir}/comms/jakarta/tomcat/bin/setclasspath.sh"
     490    <copy file="${packages.home}/tomcat-extra/setclasspath.sh"
     491      tofile="${packages.home}/tomcat/bin/setclasspath.sh"
    490492      overwrite="true"/>
    491493    <!-- make sure we have execute permission for the .sh files -->
    492     <chmod dir="${basedir}/comms/jakarta/tomcat/bin" perm="ugo+rx"
     494    <chmod dir="${packages.home}/tomcat/bin" perm="ugo+rx"
    493495      includes="*.sh"/>
    494496  </target>
    … …  
    497499  <target name="prepare-tomcat-compat" if="need.tomcat.compat">
    498500    <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"
     501      dest="${packages.home}/apache-tomcat-5.5.12-compat.zip"
    500502      usetimestamp="true"/>
    501     <unzip src="${basedir}/comms/jakarta/apache-tomcat-5.5.12-compat.zip"
    502       dest="${basedir}/comms/jakarta"/>
    503     <copy file="${basedir}/comms/jakarta/apache-tomcat-5.5.12/common/endorsed/xml-apis.jar"
     503    <unzip src="${packages.home}/apache-tomcat-5.5.12-compat.zip"
     504      dest="${packages.home}"/>
     505    <copy file="${packages.home}/apache-tomcat-5.5.12/common/endorsed/xml-apis.jar"
    504506      tofile="${web.applet}/xml-apis.jar"/>
    505     <copy file="${basedir}/comms/jakarta/apache-tomcat-5.5.12/common/endorsed/xercesImpl.jar"
     507    <copy file="${packages.home}/apache-tomcat-5.5.12/common/endorsed/xercesImpl.jar"
    506508      tofile="${web.applet}/xercesImpl.jar"/>
    507509  </target>
    … …  
    511513  <target name="configure-tomcat-local" depends="init" if="tomcat.islocal">
    512514    <!-- re-setup the server.xml file -->
    513     <copy file="${basedir}/comms/jakarta/server.xml.in" tofile="${basedir}/comms/jakarta/tomcat/conf/server.xml" overwrite="true">
     515    <copy file="${packages.home}/tomcat-extra/server.xml.in" tofile="${packages.home}/tomcat/conf/server.xml" overwrite="true">
    514516      <filterset>
    515517    <filter token="port" value="${tomcat.port}"/>
    … …  
    526528  <target name="reload" description="Reload web application"
    527529          depends="init,setup-catalina-ant-tasks">
    528     <reload  url="http://kanuka:7070/manager" username="admin" password="admin"
     530    <reload  url="http://${tomcat.server}:${tomcat.port}/manager" username="admin" password="admin"
    529531            path="${app.path}"/>
    530532  </target>
    … …  
    859861
    860862  <target name="prepare-axis" depends="init">
    861     <mkdir dir="${basedir}/comms/soap"/>
    862863    <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip"
    863       dest="${basedir}/comms/soap/axis-bin-1_2_1.zip"
     864      dest="${packages.home}/axis-bin-1_2_1.zip"
    864865      usetimestamp="true"/>
    865     <delete dir="${basedir}/comms/soap/axis.bak"/>
    866     <move todir="${basedir}/comms/soap/axis.bak"  failonerror="false">
    867       <fileset dir="${basedir}/comms/soap/axis"/>
    868     </move>
    869     <unzip src="${basedir}/comms/soap/axis-bin-1_2_1.zip"
    870       dest="${basedir}/comms/soap/"/>
    871     <move todir="${basedir}/comms/soap/axis">
    872       <fileset dir="${basedir}/comms/soap/axis-1_2_1"/>
     866    <unzip src="${packages.home}/axis-bin-1_2_1.zip"
     867      dest="${packages.home}"/>
     868    <move todir="${packages.home}/axis">
     869      <fileset dir="${packages.home}/axis-1_2_1"/>
    873870    </move>
    874871    <!-- install axis into greenstone web app -->
    875872    <copy todir="${web.lib}">
    876       <fileset dir="${basedir}/comms/soap/axis/webapps/axis/WEB-INF/lib">
     873      <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/lib">
    877874    <include name="*.jar"/>
    878875      </fileset>
    879876    </copy>
    880877    <copy todir="${web.home}">
    881       <fileset dir="${basedir}/comms/soap/axis/webapps/axis/">
     878      <fileset dir="${packages.home}/axis/webapps/axis/">
    882879    <include name="*.jsp"/>
    883880    <include name="*.jws"/>
    884881      </fileset>
    885882    </copy>
    886     <copy tofile="${web.home}/axis.html" file="${basedir}/comms/soap/axis/webapps/axis/index.html"/>
     883    <copy tofile="${web.home}/axis.html" file="${packages.home}/axis/webapps/axis/index.html"/>
    887884    <copy todir="${web.classes}">
    888       <fileset dir="${basedir}/comms/soap/axis/webapps/axis/WEB-INF/classes">
     885      <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/classes">
    889886    <include name="*.properties"/>
    890887      </fileset>
    … …  
    10421039 
    10431040<!-- ================== Packages targets ================================ -->
    1044   <!-- these targets refer to the greenstone packages - these need updating
    1045   less often, so are in  separate targets to the core -->
     1041  <!-- these targets refer to the greenstone source packages - these need
     1042  updating less often, so are in  separate targets to the core -->
    10461043  <target name="prepare-packages" depends="init,prepare-mgpp,prepare-windows"/>
    10471044 
    … …  
    10511048
    10521049  <target name="checkout-mgpp" depends="check-cvsroot,init" unless="nocvs.mode">
    1053     <cvs command="checkout -P" package="mgpp" dest="${basedir}/packages/"/>
     1050    <cvs command="checkout -P" package="mgpp" dest="${src.packages.home}"/>
    10541051  </target>
    10551052 
    … …  
    10591056
    10601057  <target name="update-packages" depends="init,cvsupdate-packages,configure-packages,clean-packages,compile-packages"
    1061     description="Update only the packages"/>
     1058    description="Update only the source packages"/>
    10621059
    10631060  <target name="cvsupdate-packages" unless="nocvs.mode">
    1064     <cvs command="update -dP" dest="${packages.home}"/>
     1061    <cvs command="update -dP" dest="${src.packages.home}"/>
    10651062  </target>
    10661063 
    … …  
    10991096  </target>
    11001097
    1101   <target name="clean-packages" depends="init,clean-packages-c++,clean-packages-java" description="Clean only the packages"/>
     1098  <target name="clean-packages" depends="init,clean-packages-c++" description="Clean only the packages"/>
    11021099
    11031100  <target name="clean-packages-c++" depends="init">
    … …  
    11191116  </target>
    11201117 
    1121   <target name="clean-packages-java" depends="init">
     1118  <target name="clean-windows-c++-packages" depends="init" if="current.os.iswindows"
     1119    description="Clean only the C/C++ packages">
     1120    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
     1121      <arg value="clean"/>
     1122    </exec>
     1123    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
     1124      <arg value="clean"/>
     1125    </exec>
     1126  </target>   
     1127
     1128  <target name="compile-packages"
     1129    description="Compile only the packages">
     1130    <echo>Compiling MG</echo>
     1131    <exec executable="make" os="${os.linux},${os.mac}"
     1132       dir="${mg.home}">
     1133    </exec>
     1134    <exec executable="make" os="${os.linux},${os.mac}"
     1135      dir="${mg.home}">
     1136      <arg value="install"/>
     1137    </exec>
     1138    <!-- windows: just the java stuff. -->
     1139    <exec executable="${mg.home}/winMake.bat" os="${os.windows}"
     1140      dir="${mg.home}">
     1141      <arg value="compile"/>
     1142      <arg value="javaonly"/>
     1143    </exec>
     1144    <!-- install the jar file -->
     1145    <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
     1146   
     1147    <!-- mgpp -->
     1148    <echo>Compiling MGPP</echo>
     1149    <exec executable="make" os="${os.linux},${os.mac}"
     1150       dir="${mgpp.home}">
     1151    </exec>
     1152    <exec executable="make" os="${os.linux},${os.mac}"
     1153      dir="${mgpp.home}">
     1154      <arg value="install"/>
     1155    </exec>
     1156    <!-- windows: just the java stuff. -->
     1157    <exec executable="${mgpp.home}/winMake.bat" os="${os.windows}"
     1158      dir="${mgpp.home}">
     1159      <arg value="compile"/>
     1160      <arg value="javaonly"/>
     1161    </exec>
     1162    <!-- install the jar file -->
     1163    <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
     1164   
     1165    <!-- javagdbm -->
     1166    <exec executable="make" os="${os.linux},${os.mac}"
     1167      dir="${javagdbm.home}">
     1168    </exec>
     1169    <exec executable="make" os="${os.linux},${os.mac}"
     1170      dir="${javagdbm.home}">
     1171      <arg value="install"/>
     1172    </exec>
     1173    <!-- windows: just the java stuff. -->
     1174    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}"
     1175      dir="${javagdbm.home}">
     1176      <arg value="compile"/>
     1177      <arg value="javaonly"/>
     1178    </exec>
     1179    <!-- install the jar file -->
     1180    <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
     1181
     1182  </target>
     1183
     1184  <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
     1185    description="Compile only the C/C++ packages">
     1186    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}"/>
     1187    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
     1188      <arg value="install"/>
     1189      <env key="GSDL3HOME" value="${basedir}"/>
     1190    </exec>
     1191    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}"/>
     1192    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
     1193      <arg value="install"/>
     1194      <env key="GSDL3HOME" value="${basedir}"/>
     1195    </exec>
     1196    <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}"/>
     1197    <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}">
     1198      <arg value="install"/>
     1199      <env key="GSDL3HOME" value="${basedir}"/>
     1200    </exec>
     1201  </target>   
     1202 
     1203  <!-- =============== Extensions targets ==================== -->
     1204 
     1205  <target name="prepare-extensions" depends="init"/>
     1206
     1207  <target name="cvsupdate-extensions" depends="init">
     1208    <cvs command="update -dP" dest="${extensions.home}"/>
     1209  </target>
     1210
     1211  <target name="configure-extensions"/>
     1212 
     1213  <target name="clean-extensions" depends="init">
    11221214    <!-- vishnu : just call the ant target -->
    11231215    <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
    … …  
    11321224  </target>
    11331225
    1134   <target name="clean-windows-c++-packages" depends="init" if="current.os.iswindows"
    1135     description="Clean only the C/C++ packages">
    1136     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    1137       <arg value="clean"/>
    1138     </exec>
    1139     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    1140       <arg value="clean"/>
    1141     </exec>
    1142   </target>   
    1143 
    1144   <target name="compile-packages"
    1145     description="Compile only the packages">
    1146     <echo>Compiling MG</echo>
    1147     <exec executable="make" os="${os.linux},${os.mac}"
    1148        dir="${mg.home}">
    1149     </exec>
    1150     <exec executable="make" os="${os.linux},${os.mac}"
    1151       dir="${mg.home}">
    1152       <arg value="install"/>
    1153     </exec>
    1154     <!-- windows: just the java stuff. -->
    1155     <exec executable="${mg.home}/winMake.bat" os="${os.windows}"
    1156       dir="${mg.home}">
    1157       <arg value="compile"/>
    1158       <arg value="javaonly"/>
    1159     </exec>
    1160     <!-- install the jar file -->
    1161     <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
    1162    
    1163     <!-- mgpp -->
    1164     <echo>Compiling MGPP</echo>
    1165     <exec executable="make" os="${os.linux},${os.mac}"
    1166        dir="${mgpp.home}">
    1167     </exec>
    1168     <exec executable="make" os="${os.linux},${os.mac}"
    1169       dir="${mgpp.home}">
    1170       <arg value="install"/>
    1171     </exec>
    1172     <!-- windows: just the java stuff. -->
    1173     <exec executable="${mgpp.home}/winMake.bat" os="${os.windows}"
    1174       dir="${mgpp.home}">
    1175       <arg value="compile"/>
    1176       <arg value="javaonly"/>
    1177     </exec>
    1178     <!-- install the jar file -->
    1179     <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
    1180    
    1181     <!-- javagdbm -->
    1182     <exec executable="make" os="${os.linux},${os.mac}"
    1183       dir="${javagdbm.home}">
    1184     </exec>
    1185     <exec executable="make" os="${os.linux},${os.mac}"
    1186       dir="${javagdbm.home}">
    1187       <arg value="install"/>
    1188     </exec>
    1189     <!-- windows: just the java stuff. -->
    1190     <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}"
    1191       dir="${javagdbm.home}">
    1192       <arg value="compile"/>
    1193       <arg value="javaonly"/>
    1194     </exec>
    1195     <!-- install the jar file -->
    1196     <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/>
    1197 
     1226  <target name="compile-extensions">
    11981227    <!-- vishnu -->
    11991228    <echo>Compiling Vishnu</echo>
    … …  
    12111240  </target>
    12121241
    1213   <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
    1214     description="Compile only the C/C++ packages">
    1215     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}"/>
    1216     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    1217       <arg value="install"/>
    1218       <env key="GSDL3HOME" value="${basedir}"/>
    1219     </exec>
    1220     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}"/>
    1221     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    1222       <arg value="install"/>
    1223       <env key="GSDL3HOME" value="${basedir}"/>
    1224     </exec>
    1225     <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}"/>
    1226     <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}">
    1227       <arg value="install"/>
    1228       <env key="GSDL3HOME" value="${basedir}"/>
    1229     </exec>
    1230   </target>   
    1231  
    12321242  <!-- ================== gs2building targets ===============-->
    12331243
    … …  
    14781488  <target name="prepare-for-dist-1" depends="init">
    14791489    <cvs command="export -D '1 second ago'" package="mgpp"
    1480       dest="${basedir}/packages/"
     1490      dest="${src.packages.home}"
    14811491      cvsRoot="${cvs.root}" />
    14821492    <cvs command="export -D '1 second ago'" package="gs2build"
    … …  
    14981508    <delete file="${packages.home}/mysql/var/log/mysql.log"/>
    14991509    <antcall target="prepare-tomcat"/>
    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"/>
     1510    <delete file="${packages.home}/apache-tomcat-5.5.12.zip"/>
     1511    <delete file="${packages.home}/apache-tomcat-5.5.12-compat.zip"/>
    15021512    <antcall target="configure-tomcat"/>
    15031513    <antcall target="prepare-axis"/>
    1504     <delete file="${basedir}/comms/soap/axis-bin-1_2_1.zip"/>
     1514    <delete file="${packages.home}/axis-bin-1_2_1.zip"/>
    15051515    <!-- delete old axis dir -->
    1506     <delete dir="${basedir}/comms/soap/axis"/>
     1516    <delete dir="${packages.home}/axis"/>
    15071517    <antcall target="prepare-web"/>
    15081518  </target>
Note: See TracChangeset for help on using the changeset viewer.