Changeset 17453 for release-kits/mark3/ant-scripts

Timestamp:

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

Author:

oranfry

Message:

making mac release kits use components

Location:

release-kits/mark3/ant-scripts

Files:

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

release-kits/mark3/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" />
@@ -11 +10 @@
     </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" />
@@ -38 +32 @@
     <target name="prepare-core-component">
 
+        <delete dir="components/tmp/core"/>
         <mkdir dir="components/tmp/core"/>
                 
@@ -74 +69 @@
     
     <target name="prepare-sourcecode-component">
+
+        <delete dir="components/tmp/sourcecode"/>
         <mkdir dir="components/tmp/sourcecode"/>
+
         <copy todir="components/tmp/sourcecode" overwrite="true">
                 <fileset dir="distribution/greenstone3">
@@ -92 +90 @@
     
     <target name="prepare-ant-component">
-        <mkdir dir="components/tmp/ant"/>
+
+        <delete dir="components/tmp/ant">
+        <mkdir dir="components/tmp/ant">
+
         <copy todir="components/tmp/ant" overwrite="true">
             <fileset dir="distribution/greenstone3/packages">
@@ -107 +108 @@
     
     <target name="prepare-tomcat-component">
+
+        <delete dir="components/tmp/tomcat"/>
         <mkdir dir="components/tmp/tomcat"/>
+
         <copy todir="components/tmp/tomcat" overwrite="true">
             <fileset dir="distribution/greenstone3/packages">

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

@@ -14 +14 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${mark3.home}/greenstone3/installer-classes"/>
+            <fileset file="${basedir}/distribution/greenstone3/LICENCE.txt" /> 
         </copy>
         <unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
@@ -20 +21 @@
 
     <target name="compile-installer">
+
         <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"
                 compress="true"
@@ -30 +32 @@
                 failOnError="false"
                 icons="bluecurve">
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
+            <zipfileset dir="${basedir}/components" includes="*.lzma"/>
+        </installer>
 
-            <!-- copy all the important files into the archive to be extracted for install -->
-            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
-            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
+        <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="${mark3.home}/packages/ant-installer/lib"
+                antLib="${mark3.home}/packages/ant/lib"
+                validateConfig="true"
+                failOnError="false"
+                icons="bluecurve">
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+            <zipfileset dir="${basedir}/components" includes="core.lzma"/>
+        </installer>
 
-        </installer>
+
     </target>