Changeset 10882

Timestamp:

2005-11-11T10:45:59+13:00 (18 years ago)

Author:

kjdon

Message:

moved the prepare mysql stuff into its own parepare-for-dist target -sometimes it goes wrong, and we need to run it again

File:

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

trunk/gsdl3/build.xml

@@ -358 +358 @@
       <equals arg1="" arg2="${proxy.host}"/>
     </not>
+      </and>
+    </condition>
+
+    <condition property="need.macos.extra">
+      <and>
+    <isset property="current.os.ismac"/>
+    <isset property="gsdl2.islocal"/>
       </and>
     </condition>
@@ -1295 +1302 @@
   
   <!-- downloads a good XML-Parser -->
-  <target name="get-macos-extra" depends="init" if="current.os.ismac">  
+  <target name="get-macos-extra" depends="init" if="need.macos.extra">  
       <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
       dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
@@ -1302 +1309 @@
 
   <!-- untars the XML-Parser. need to do this after compiling in gs2build-->
-  <target name="install-macos-extra" depends="init" if="current.os.ismac">
+  <target name="install-macos-extra" depends="init" if="need.macos.extra">
     <!-- make sure these directories are present, otherwise chmod craps out 
     this chmod is needed in case we are unpacking for a second time -->
@@ -1511 +1518 @@
     <antcall target="get-perl-for-windows"/>
     <antcall target="get-macos-extra"/>
-    <antcall target="prepare-mysql"/>
-    <delete file="${packages.home}/mysql-standard-4.1.15-pc-linux-gnu-i686.tar.gz"/>
-    <delete file="${packages.home}/mysql-standard-4.1.15-apple-darwin7.9.0-powerpc.tar.gz"/>
-    <delete file="${packages.home}/mysql-noinstall-4.1.15-win32.zip"/>
-    <delete dir="${packages.home}/mysql/sql-bench"/>
-    <delete dir="${packages.home}/mysql/tests"/>
-    <delete dir="${packages.home}/mysql/mysql-test"/>
-    <delete file="${packages.home}/mysql/var/log/mysql.log"/>
     <antcall target="prepare-tomcat"/>
     <delete file="${packages.home}/apache-tomcat-5.5.12.zip"/>
@@ -1531 +1530 @@
   
   <target name="prepare-for-dist-2" depends="init">
+    <antcall target="prepare-mysql"/>
+    <delete file="${packages.home}/mysql-standard-4.1.15-pc-linux-gnu-i686.tar.gz"/>
+    <delete file="${packages.home}/mysql-standard-4.1.15-apple-darwin7.9.0-powerpc.tar.gz"/>
+    <delete file="${packages.home}/mysql-noinstall-4.1.15-win32.zip"/>
+    <delete dir="${packages.home}/mysql/sql-bench"/>
+    <delete dir="${packages.home}/mysql/tests"/>
+    <delete dir="${packages.home}/mysql/mysql-test"/>
+    <delete file="${packages.home}/mysql/var/log/mysql.log"/>
+  </target>
+  
+  <target name="prepare-for-dist-3" depends="init">
     <antcall target="configure-c++"/>
   </target>
   
-  <target name="prepare-for-dist-3" depends="init">
+  <target name="prepare-for-dist-4" depends="init">
     <antcall target="compile"/>
     <antcall target="clean-packages-c++"/>