Changeset 17597 for release-kits/mark2

Timestamp:

2008-10-24T11:00:08+13:00 (16 years ago)

Author:

oranfry

Message:

untested changes to exclude sourcecode from the binary release, use nicer target names and icons

Location:

release-kits/mark2

Files:

• ant-scripts/build.xml (modified) (2 diffs)
• ant-scripts/create-installer.xml (modified) (2 diffs)
• installer/antinstall-config.xml (modified) (3 diffs)
• installer/build.xml (modified) (1 diff)

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

@@ -9 +9 @@
 
 <project name="mark2-build" default="mark2">
-
 
     <!-- CONSTANTS -->
@@ -45 +44 @@
     </target>
 
+    <property name="os.suffix" value="MacOS-${processor}"/>
+
     <!-- THE MAIN TARGET -->
     <target name="mark2" depends="init,mark2-init">

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

@@ -5 +5 @@
         <antcall target="copy-installer-files"/>
         <antcall target="make-installer-files-concrete"/> <!-- from rk2-targets -->
-        <antcall target="compile-installer"/>
+        <antcall target="compile-binary-installer"/> <!-- from init -->
+        <antcall target="compile-minimal-installer"/> <!-- from init -->
+        <antcall target="compile-source-installer"/> <!-- from init -->
     </target>
 
     <target name="copy-installer-files">
-        <echo>Copying installer files</echo>
         <mkdir dir="${basedir}/installer/classes"/>
         <copy todir="${basedir}/installer" file="${mark2.home}/installer/antinstall-config.xml" overwrite="true"/>
@@ -26 +27 @@
     </target>
 
-    <target name="compile-installer">
-        <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.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="*.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>
-
 </project>

release-kits/mark2/installer/antinstall-config.xml

@@ -52 +52 @@
             displayText=""/>
 
+        <!-- start sourcecode -->
         <target
             target="Installing Source Code"
@@ -57 +58 @@
             defaultValue="false"
             displayText=""/>
+        <!-- end sourcecode -->
 
     </page>
@@ -65 +67 @@
     </page>
 
-    <page type="progress" name="progress" showTargets="false" displayText=""></page>
+    <page type="progress" name="progress" showTargets="true" displayText=""/>
 
 </installer>

release-kits/mark2/installer/build.xml

@@ -34 +34 @@
 
         <!-- install files -->
-        <echo message="Installing Core Files"/>
+        <echo message="Installing Core System"/>
         <unzip src="${antinstaller.jar}" dest="${installDir}">
             <patternset>