Changeset 10713

Timestamp:

2005-10-07T15:16:57+13:00 (19 years ago)

Author:

kjdon

Message:

some more changes for the release - particulary to do with deleting stuff so the release is not too big

File:

• trunk/gsdl3/build.xml (modified) (11 diffs)

trunk/gsdl3/build.xml

@@ -379 +379 @@
     <unzip src="${collect.dir}/gs3mgdemo/index/index.zip" 
       dest="${collect.dir}/gs3mgdemo/index"/>
+    <delete file="${collect.dir}/gs3mgdemo/import.zip"/>
+    <delete file="${collect.dir}/gs3mgdemo/archives.zip"/>
+    <delete file="${collect.dir}/gs3mgdemo/index/index.zip"/>
     <!-- gs2mgdemo -->
     <unzip src="${collect.dir}/gs2mgdemo/import.zip" 
@@ -386 +389 @@
     <unzip src="${collect.dir}/gs2mgdemo/index/index.zip" 
       dest="${collect.dir}/gs2mgdemo/index"/>
+    <delete file="${collect.dir}/gs2mgdemo/import.zip"/>
+    <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/>
+    <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/>
     <!-- gs2mgppdemo -->
     <unzip src="${collect.dir}/gs2mgppdemo/import.zip" 
@@ -393 +399 @@
     <unzip src="${collect.dir}/gs2mgppdemo/index/index.zip" 
       dest="${collect.dir}/gs2mgppdemo/index"/>
+    <delete file="${collect.dir}/gs2mgppdemo/import.zip"/>
+    <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/>
+    <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/>
     <!-- gberg -->
     <unzip src="${collect.dir}/gberg/index/index.zip" 
       dest="${collect.dir}/gberg/index"/>
+    <delete file="${collect.dir}/gberg/index/index.zip"/>
     <mkdir dir="${web.home}/applet"/>
 
@@ -415 +425 @@
       <path path="${web.home}"/>
     </pathconvert>
+    <!-- just in case these haven't been defined, we need something to write to
+    the file -->
+    <property name="mysql.admin.password" value=" "/>
+    <property name="mysql.reader.password" value=" "/>
     <filter token="gsdl3home" value="${gsdl3.home.unix}"/>
     <filter token="mysql.port" value="${mysql.port}"/>
@@ -1094 +1108 @@
   </target>
 
-  <target name="clean-packages"
-    description="Clean only the packages">
+  <target name="clean-packages" depends="init,clean-packages-c++,clean-packages-java" description="Clean only the packages"/>
+  <target name="clean-packages-c++" depends="init">
     <!-- mg : just call the make target -->
     <exec executable="make" os="${os.linux},${os.mac}"
@@ -1106 +1120 @@
       <arg value="clean"/>
     </exec>
+  </target>
+  <target name="clean-packages-java" depends="init">
     <!-- vishnu : just call the ant target -->
     <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
@@ -1302 +1318 @@
   </target>
 
-  <target name="clean-gs2building" depends="init" if="gsdl2.islocal"
-    description="Clean only the Greenstone 2 building components">
+  <target name="clean-gs2building" depends="init,clean-gli,clean-gs2build" if="gsdl2.islocal"
+    description="Clean only the Greenstone 2 building components"/>
+  <target name="clean-gli" depends="init">
     <!-- gli -->
     <property name="gli.home" value="${basedir}/gli"/>
@@ -1312 +1329 @@
     <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}"
       resolveExecutable="true"/>
+  </target>
+  <target name="clean-gs2build" depends="init">
     <!-- gs2build -->
     <!--linux:  -->
@@ -1319 +1338 @@
     <!-- windows: -->    
   </target>
-    
+  
   <target name="clean-windows-c++-gs2building" depends="init" if="current.os.iswindows"
     description="remove all object files and executables">
@@ -1429 +1448 @@
 <!-- ====================== DISTRIBUTION Targets ========================= -->
 
-  <target name="prepare-for-dist" depends="init">
+  <target name="prepare-for-dist-1" depends="init">
     <cvs command="export -D '1 second ago'" package="mgpp" 
       dest="${basedir}/packages/"
@@ -1441 +1460 @@
     <antcall target="get-windows-binaries"/>
     <antcall target="prepare-mysql"/>
+    <delete file="${packages.home}/mysql-standard-4.1.11-pc-linux-gnu-i686.tar.gz"/>
+    <delete dir="${packages.home}/mysql/sql-bench"/>
+    <delete dir="${packages.home}/mysql/tests"/>
+    <delete dir="${packages.home}/mysql/mysql-test"/>
     <antcall target="prepare-tomcat"/>
+    <delete file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7.zip"/>
+    <delete file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7-compat.zip"/>
     <antcall target="configure-tomcat"/>
     <antcall target="prepare-axis"/>
+    <delete file="${basedir}/comms/soap/axis-bin-1_2_1.zip"/>
     <!-- delete old axis dir -->
     <delete dir="${basedir}/comms/soap/axis"/>
     <antcall target="prepare-web"/>
+  </target>
+  
+  <target name="prepare-for-dist-2" depends="init">
     <antcall target="configure-c++"/>
+  </target>
+  
+  <target name="prepare-for-dist-3" depends="init">
     <antcall target="compile"/>
+    <antcall target="clean-packages-c++"/>
+    <antcall target="clean-gs2build"/>
     <antcall target="deploy-localsite"/> 
     <xslt in="build.xml" out="dist-build.xml" style="dist-resources/convert-build-xml.xsl"/>