Changeset 17597 for release-kits/mark3

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/mark3

Files:

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

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

@@ -44 +44 @@
     </target>
 
+    <property name="os.suffix" value="MacOS-${processor}"/>
+
     <!-- THE MAIN TARGET -->
     <target name="mark3" depends="init,mark3-init">

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

@@ -5 +5 @@
         <antcall target="copy-installer-files"/>
         <antcall target="make-installer-files-concrete"/> <!-- from rk3-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>Getting things ready to compile the installer</echo>
         <copy todir="${basedir}/installer" file="${mark3.home}/installer/antinstall-config.xml" overwrite="true" />
         <copy todir="${basedir}/installer" file="${mark3.home}/installer/build.xml" overwrite="true" />
@@ -20 +21 @@
     </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="${mark3.home}/packages/ant-installer/lib"
-                antLib="${mark3.home}/packages/ant/lib"
-                validateConfig="true"
-                failOnError="false"
-                icons="bluecurve">
-            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
-            <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="${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>
-
-
-    </target>
-
 </project>

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

@@ -46 +46 @@
 
         <target
-            target="install-core-components"
+            target="Installing Core System"
             diskRequirement="@component.size.core@"
             defaultValue="true"
@@ -52 +52 @@
             force="true"/>
 
+        <!-- start bundled components -->
         <target
-            target="install-tomcat"
+            target="Installing Tomcat"
             diskRequirement="@component.size.tomcat@"
             defaultValue="true"
@@ -59 +60 @@
 
         <target
-            target="install-ant"
+            target="Installing Ant"
             diskRequirement="@component.size.ant@"
             defaultValue="true"
             displayText=""/>
+        <!-- end bundled components -->
 
+        <!-- start sourcecode -->
         <target
-            target="install-source-code"
+            target="Installing Source Code"
             diskRequirement="@component.size.sourcecode@"
             defaultValue="false"
             displayText=""/>
+        <!-- end sourcecode -->
 
     </page>
 
-    <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText="">
+    <page type="input" name="tomcat-config" ifProperty="(${Installing Tomcat}==true)" displayText="">
 
         <text property="tomcat.server" defaultValue="localhost" displayText=""/>
@@ -80 +84 @@
     </page>
 
-    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText="">
-    </page>
+    <page type="progress" name="progress" showTargets="true" displayText=""/>
 
 </installer>

release-kits/mark3/installer/build.xml

@@ -17 +17 @@
     <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
 
-    <target name="install-core-components" depends="">
+    <target name="Installing Core System" depends="">
 
         <!-- create the installation directory -->
@@ -83 +83 @@
 
     <!-- Source -->
-    <target name="install-source-code" depends="">
+    <target name="Installing Source Code" depends="">
         <echo>Installing Source Code</echo>
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
@@ -92 +92 @@
     </target>
 
-    <target name="install-tomcat">
+    <target name="Installing Tomcat">
         <echo message="Installing Tomcat (packages/tomcat)"/>
         <mkdir dir="packages"/>
@@ -118 +118 @@
     </target>
 
-    <target name="install-ant">
+    <target name="Installing Ant">
 
         <!-- extract the files -->
@@ -134 +134 @@
     </target>
 
-
-
-    <target name="cleanuptarget">
-    </target>
-    
-
 </project>