Changeset 17453 for release-kits/mark2

Timestamp:

2008-10-02T12:38:47+13:00 (16 years ago)

Author:

oranfry

Message:

making mac release kits use components

Location:

release-kits/mark2/ant-scripts

Files:

• build.xml (modified) (2 diffs)
• create-components.xml (modified) (3 diffs)
• create-installer.xml (modified) (2 diffs)

release-kits/mark2/ant-scripts/build.xml

@@ -26 +26 @@
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
+    <import file="create-components.xml"/>
     <import file="create-installer.xml"/>
     <import file="wrap.xml"/>
@@ -48 +49 @@
         <antcall target="compile"/>
         <antcall target="create-distribution"/>
+        <antcall target="create-components"/>
         <antcall target="create-installer"/>
         <antcall target="wrap"/>

release-kits/mark2/ant-scripts/create-components.xml

@@ -4 +4 @@
     <!-- create components from the distribution folder -->
     <target name="create-components">
-        <antcall target="prepare-to-create-components" />
         <antcall target="create-core-component" />
         <antcall target="create-sourcecode-component" />
     </target>
     
-    <target name="prepare-to-create-components">
-        <delete dir="components"/>
-        <mkdir dir="components/tmp"/>
-    </target>
-
     <target name="create-core-component">
         <antcall target="prepare-core-component" />
@@ -25 +19 @@
     
     <target name="prepare-core-component">
+
+        <delete dir="components/tmp/core"/>
         <mkdir dir="components/tmp/core"/>
+
         <copy todir="components/tmp/core" overwrite="true">
             <fileset dir="distributions/web">
@@ -45 +42 @@
     
     <target name="prepare-sourcecode-component">
+
+        <delete dir="components/tmp/sourcecode"/>
         <mkdir dir="components/tmp/sourcecode"/>
+
         <copy todir="components/tmp/sourcecode" overwrite="true">
             <fileset dir="distributions/web">

release-kits/mark2/ant-scripts/create-installer.xml

@@ -15 +15 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${mark2.home}/greenstone2/installer-classes"/>
+            <fileset file="${basedir}/distributions/web/LICENCE.txt" /> 
         </copy>
+
         <unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+
         <unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+
     </target>
 
@@ -35 +39 @@
 
             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-            <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
+            <zipfileset dir="${basedir}/components" includes="*.lzma"/>
+        </installer>
 
+        <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}-minimal.jar"
+                compress="true"
+                extractType="NonExtractor"
+                installConfig="${basedir}/installer/antinstall-config.xml"
+                buildFile="${basedir}/installer/build.xml"
+                antInstallLib="${mark2.home}/packages/ant-installer/lib"
+                antLib="${mark2.home}/packages/ant/lib"
+                validateConfig="true"
+                failOnError="false"
+                icons="bluecurve">
+
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+            <zipfileset dir="${basedir}/components" includes="core.lzma"/>
         </installer>
+
     </target>