Changeset 9513

Timestamp:

2005-03-30T15:03:22+12:00 (19 years ago)

Author:

kjdon

Message:

small changes

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (6 diffs)

branches/ant-install-branch/gsdl3/build.xml

@@ -106 +106 @@
 
   <property name="compile.debug"       value="true"/>
-  <property name="compile.deprecation" value="false"/>
+  <property name="compile.deprecation" value="true"/>
   <property name="compile.optimize"    value="true"/>
 
@@ -140 +140 @@
 
     <!-- Include the axis jar files -->
-    <fileset dir="${basedir}/comms/axis/lib">
+    <fileset dir="${basedir}/comms/soap/axis/lib">
       <include name="*.jar"/>
     </fileset>
@@ -422 +422 @@
     <fail if="java.too.old" message="You need Java 1.4 or greater to run Greenstone 3"/>
     
-    <available file="${basedir}/packages/mgpp" property="mgpp.present"/>
+    <available file="${basedir}/packages/mgpp/text" property="mgpp.present"/>
     <available file="${basedir}/comms/jakarta/tomcat" property="tomcat.present"/>
     <available file="${basedir}/gli" property="gli.present"/>
     <available file="${basedir}/gs2build" property="gs2build.present"/>
-    <available file="${basedir}/comms/axis" property="axis.present"/>
+    <available file="${basedir}/comms/soap/axis" property="axis.present"/>
+    <available file="${basedir}/comms/jakarta/tomcat/webapps/axis" property="axis.installed"/>
     <condition property="gsdl2.islocal">
       <or>
@@ -454 +455 @@
     <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}" proxypassword="${proxy.password}"/>
   </target>
-
-  <target name="test-classpath">
-    <echo>${java.class.path}</echo>
-  </target>
   
   <!-- this is all the do-once things -->
-  <target name="preparation" depends="init,prepare-mgpp,prepare-gs2building,prepare-tomcat,prepare-axis,unpack-collections">
-  </target>
-  
+  <target name="preparation" depends="init,update-gsdl3,prepare-mgpp,prepare-gs2building,prepare-tomcat,prepare-axis,unpack-collections">
+  </target>
+  
+  <target name="update-gsdl3">
+    <cvs command="update -dP"/>
+  </target>
+
   <!-- this is config stuff, that can be done more than once - should be rerun is the build.properties file changes -->
   <target name="configuration" depends="init,configure-tomcat,configure-files"/>
@@ -569 +570 @@
       <equals arg1="1.4" arg2="${ant.java.version}"/>
     </condition>
-    <antcall target="install-tomcat-compat"/>
+    <antcall target="prepare-tomcat-compat"/>
     <move todir="${basedir}/comms/jakarta/tomcat">
       <fileset dir="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7"/>
@@ -598 +599 @@
   <target name="prepare-axis" depends="init" unless="axis.present">
     <get src="http://www.greenstone.org/gs3files/axis-1_1.zip"
-      dest="${basedir}/comms/axis-1_1.zip"/>
-    <unzip src="${basedir}/comms/axis-1_1.zip"
-      dest="${basedir}/comms/"/>
-    <move todir="${basedir}/comms/axis">
-      <fileset dir="${basedir}/comms/axis-1_1"/>
+      dest="${basedir}/comms/soap/axis-1_1.zip"/>
+    <unzip src="${basedir}/comms/soap/axis-1_1.zip"
+      dest="${basedir}/comms/soap/"/>
+    <move todir="${basedir}/comms/soap/axis">
+      <fileset dir="${basedir}/comms/soap/axis-1_1"/>
     </move>
-
-  </target>
-  
-  <target name="prepare-gs2building" depends="init, prepare-gs2build,prepare-gli" if="gsdl2.islocal">
+    <!-- install the webapp into tomcat -->
+    <copy todir="${tomcat.home}/webapps/axis">
+      <fileset dir="${basedir}/comms/soap/axis/webapps/axis"/>
+    </copy>
+  </target>
+
+
+  <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="gsdl2.islocal">
     <echo>checking out gs2 building stuff</echo>
   </target>