Changeset 13400

Timestamp:

2006-12-01T14:40:42+13:00 (17 years ago)

Author:

kjdon

Message:

reorganised the create distributions targets

File:

• trunk/gsdl3/dist-resources/dist-build.xml (modified) (6 diffs)

trunk/gsdl3/dist-resources/dist-build.xml

@@ -19 +19 @@
   <!-- Create the binaries for windows distribution -->
   <target name="prepare-windows" depends="init">
-    <cvs command="export -D '1 second ago'" package="mgpp" 
+    <cvs command="checkout -P" package="mgpp" 
       dest="${src.packages.home}"
       cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gs2build"
+    <cvs command="checkout -P" package="gs2build"
       cvsRoot="${cvs.root}" /> 
     <antcall target="unzip-windows-packages"/>
     <antcall target="checkout-winbin"/>
+    <antcall target="get-perl-for-windows"/>
+  </target>
+  
+  <target name="build-windows" depends="init">
+    <antcall target="cvsupdate-distribution"/>
+    <cvs command="update -dP" package="winbin"
+      cvsRoot="${cvs.root}" />
     <antcall target="get-windows-binaries"/>
-    <antcall target="get-perl-for-windows"/>
     <antcall target="rename-gs2build-files-windows"/>
     <antcall target="compile-windows-c++"/>
     <antcall target="compile-packages"/>
    </target>
-
-  <!-- Create the binaries for Mac distribution -->
-  <target name="prepare-macos-1" depends="init">
-    <cvs command="export -D '1 second ago'" package="mgpp" 
+  
+  <!-- Create the binaries for Unix/Mac distributions -->
+  <target name="prepare-unix" depends="init">
+    <cvs command="checkout -P" package="mgpp" 
       dest="${src.packages.home}"
       cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gs2build"
-      cvsRoot="${cvs.root}" />
+    <cvs command="checkout -P" package="gs2build"
+      cvsRoot="${cvs.root}" />
+  </target>
+
+  <target name="update-unix" depends="init">
+    <antcall target="cvsupdate-distribution"/>
     <antcall target="rename-gs2build-files-unix"/>
     <antcall target="delete-windows-files"/>
-    <antcall target="get-macos-extra"/>
+  </target>
+  
+  <target name="configure-unix" depends="init">
     <antcall target="configure-c++"/>
-  </target>
-  
-  <target name="prepare-macos-2" depends="init">
+  </target>    
+  <target name="build-unix" depends="init">
     <antcall target="compile-packages"/>
     <antcall target="compile-gs2build"/>
   </target>
-  
-  <!-- Get the binaries for linux distribution -->
-  <target name="prepare-linux-1" depends="init">
-    <cvs command="export -D '1 second ago'" package="mgpp" 
-      dest="${src.packages.home}"
-      cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gs2build"
-      cvsRoot="${cvs.root}" />
-    <cvs command="export -D '1 second ago'" package="gli"
-      cvsRoot="${cvs.root}" />
-    <delete file="${gli.home}/gli.bat"/>
-    <delete file="${gli.home}/gli.sh"/>
-    <antcall target="rename-gs2build-files-unix"/>
-    <!--<antcall target="checkout-winbin"/>
-    <antcall target="get-windows-binaries"/>
-    <antcall target="get-perl-for-windows"/>-->
-    <delete>
-      <fileset dir="${lib.jni}" includes="*.dll"/>
-    </delete>
-  </target>
-  
-  
-  <target name="prepare-linux-2" depends="init">
-    <antcall target="configure-c++"/>
-  </target>
-  
-  <target name="prepare-linux-3" depends="init">
-    <antcall target="compile-packages"/>
-    <antcall target="compile-gs2build"/>
-  </target>
-  
+    
   <!-- creates the base distribution. Needs binaries copied in to it from other
-    greenstones (prepare-for-dists) -->
+    greenstones (prepare-os targets) -->
   <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up">
     <cvs command="export -D '1 second ago'" package="mgpp" 
@@ -97 +78 @@
     
     <!--<antcall target="unzip-windows-packages"/> do we need this?-->
-    <antcall target="get-macos-extra"/>
     <antcall target="download-tomcat"/>
     <delete file="${packages.home}/apache-tomcat-5.5.12.zip"/>
@@ -109 +89 @@
 
     <antcall target="prepare-collections"/>
-    <antcall target="install-macos-extra"/>
+
+    <!-- get good XML-Parser - does this work? -->
+    <antcall target="get-xml-parser"/>
     <!-- documented collections -->
     <antcall target="get-documented-collections"/>
@@ -134 +116 @@
     <!-- compile the java stuff -->
     <antcall target="compile-web"/>
-    <antcall target="configure-packages"/>
+<!--    <antcall target="configure-packages"/>
     <antcall target="compile-packages"/>
-    <antcall target="distclean-packages"/>
+    <antcall target="distclean-packages"/>-->
     <antcall target="compile-core"/>
     <antcall target="compile-gli"/>
@@ -227 +209 @@
     <!--<delete dir="${basedir}/dist-resources"/>-->
 
+  </target>
+
+  <!-- Supplementary targets -->
+
+  <target name="cvsupdate-distribution" depends="init">
+    <antcall target="cvsupdate-packages"/>
+    <antcall target="cvsupdate-core"/>
+    <antcall target="cvsupdate-gs2build"/>
+    <antcall target="cvsupdate-web"/>
   </target>
 
@@ -307 +298 @@
       <fileset dir="${documented.collections.home}/wrdpdf-e"/>
     </copy>
+  </target>
+
+  <target name="get-xml-parser" depends="init">
+    <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
+      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
+      usetimestamp="true"/>
+    <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
+      dest="${gs2build.home}/perllib/cpan/"
+      compression="gzip"/>
+    <delete file="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"/>
   </target>