Changeset 17396 for release-kits/lirk2/ant-scripts

Timestamp:

2008-09-26T17:37:32+12:00 (16 years ago)

Author:

oranfry

Message:

componentised releases in wirk2

Location:

release-kits/lirk2/ant-scripts

Files:

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

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

@@ -16 +16 @@
     <property name="rk.os" value="linux" />
 
+    <property name="bundled.version.ghostscript" value=""/>
+    <property name="bundled.version.imagemagick" value=""/>
+    
     <!-- IMPORT OTHER ANT SCRIPTS -->
     <import file="shared-ant-scripts/init.xml"/>
@@ -22 +25 @@
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
+    <import file="create-components.xml"/>
     <import file="create-installer.xml"/>
     <import file="wrap.xml"/>
@@ -29 +33 @@
         <antcall target="compile"/>
         <antcall target="create-distribution"/>
+        <antcall target="create-components"/>
         <antcall target="create-installer"/>
         <antcall target="wrap"/>

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

@@ -15 +15 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${lirk2.home}/greenstone2/installer-classes"/>
+            <fileset file="${basedir}/distributions/web/LICENSE.txt"/>
         </copy>
+
         <unjar src="${lirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+
+        <unjar src="${lirk2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+        <delete dir="${basedir}/installer/classes/META-INF"/>
+
         <unjar src="${lirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
@@ -24 +30 @@
     <target name="compile-installer">
 
-        <!-- create the installer with java -->
+        <!-- create the full installer -->
         <installer file="${basedir}/installer/Greenstone-${version}-linux.jar"
                 compress="true"
@@ -37 +43 @@
 
             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-            <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
+            <zipfileset dir="${basedir}/components" includes="*.lzma"/>
 
         </installer>
+
+        <dcff
+            file="${basedir}/installer/antinstall-config.xml"
+            startTag=".*&lt;!-- start full --&gt;"
+            endTag=".*&lt;!-- end full --&gt;"/>
+
+        <!-- create the minimal installer -->
+        <installer file="${basedir}/installer/Greenstone-${version}-linux-minimal.jar"
+                compress="true"
+                extractType="NonExtractor"
+                installConfig="${basedir}/installer/antinstall-config.xml"
+                buildFile="${basedir}/installer/build.xml"
+                antInstallLib="${lirk2.home}/packages/ant-installer/lib"
+                antLib="${lirk2.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>

release-kits/lirk2/ant-scripts/wrap.xml

@@ -49 +49 @@
         <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
-        <echo level="info">compile the wrapper program</echo>
-        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
-            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
-        </exec>
-
         <echo level="info">compile libsearch4j</echo>
         <exec executable="g++" dir="${basedir}/wrapped-installer/build">
@@ -65 +60 @@
         <exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
 
+        <echo level="info">compile the wrapper program</echo>
+        <exec executable="g++" dir="${basedir}/wrapped-installer/build">
+            <arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
+        </exec>
+
         <echo level="info">link the compiled code and bundled files</echo>
         <exec executable="g++" dir="${basedir}/wrapped-installer/build">