Changeset 16818 for release-kits

Timestamp:

2008-08-15T15:21:41+12:00 (16 years ago)

Author:

oranfry

Message:

fixed installer sourcecode target, use shared code from rk2 targets and show compnent sizes in mark2

Location:

release-kits/mark2

Files:

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

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

@@ -22 +22 @@
     <import file="shared-ant-scripts/init.xml"/>
     <import file="shared-ant-scripts/operations-on-gli.xml"/>
+    <import file="../greenstone2/ant-scripts.xml"/>
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>

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

@@ -3 +3 @@
 
     <target name="create-installer">
-        <antcall target="setup-for-installer-creation"/>
+        <antcall target="copy-installer-files"/>
+        <antcall target="make-installer-files-concrete"/> <!-- from rk2-targets -->
         <antcall target="compile-installer"/>
     </target>
 
-    <target name="setup-for-installer-creation">
-        <echo>Getting things ready to compile the installer</echo>
+    <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"/>
@@ -14 +15 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${mark2.home}/greenstone2/installer-classes"/>
-        <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
+            <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
         </copy>
-
-        <!-- put the concrete values of things in the config -->
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/>
-        <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
-        <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
-
-        <!-- put the concrete values of things in the text -->
-        <!-- default -->
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/>
     </target>
 
     <target name="compile-installer">
-        <!-- create the installer without java -->
         <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"
                 compress="true"

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

@@ -35 +35 @@
         <comment name="choose-components"/>
 
-        <target target="install-core-components"    defaultValue="true" force="true" displayText="" />
-        <target target="install-source-code"        defaultValue="false" displayText="" />
+        <target target="install-core-components"    diskRequirement="@component.size.core@" defaultValue="true" force="true" displayText="" />
+        <target target="install-source-code"        diskRequirement="@component.size.sourcecode@" defaultValue="false" displayText="" />
 
     </page>

release-kits/mark2/installer/build.xml

@@ -84 +84 @@
     <!-- Source -->
     <target name="install-source-code" depends="">
-        <echo message="Installing Source Code (src)"/>
-        <mkdir dir="${installDir}/src"/>
-        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="src/**/*"/></patternset></unzip>
+        <echo message="Installing Source Code"/>
+        <unzip src="${antinstaller.jar}" dest="${installDir}">
+            <patternset>
+                <include name="common-src/**/*"/>
+                <include name="runtime-src/**/*"/>
+                <include name="build-src/**/*"/>
+                <include name="packages/**/*"/>
+            </patternset>
+        </unzip>
     </target>