Changeset 17422 for release-kits/lirk3/ant-scripts

Timestamp:

2008-10-01T11:58:04+13:00 (16 years ago)

Author:

oranfry

Message:

made the create-components targets more stable

Location:

release-kits/lirk3/ant-scripts

Files:

• compile.xml (modified) (1 diff)
• create-components.xml (added)
• create-installer.xml (modified) (2 diffs)

release-kits/lirk3/ant-scripts/compile.xml

@@ -28 +28 @@
 
         <!-- search4j -->
-        <antcall target="compile-search4j" /> <!-- from rk3-targets -->
+        <antcall target="compile-search4j-unix" /> <!-- from rk3-targets -->
 
         <!-- uninstaller -->

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

@@ -15 +15 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
+            <fileset dir="${lirk3.home}/distribution/greenstone3/LICENSE.txt"/>
         </copy>
+
         <unjar src="${lirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+
+        <unjar src="${lirk3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+        <delete dir="${basedir}/installer/classes/META-INF"/>
+
     </target>
 
     <target name="compile-installer">
-
-        <installer file="${basedir}/installer/greenstone3-with-java.jar"
-                compress="true"
-                extractType="NonExtractor"
-                installConfig="${basedir}/installer/antinstall-config.xml"
-                buildFile="${basedir}/installer/build.xml"
-                antInstallLib="${lirk3.home}/packages/ant-installer/lib"
-                antLib="${lirk3.home}/packages/ant/lib"
-                validateConfig="true"
-                icons="bluecurve">
-
-            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
-            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
-
-        </installer>
-
-        <!-- delete the bundled java lines from the installer config -->
-        <dcff
-            file="${basedir}/installer/antinstall-config.xml"
-            startTag=".*&lt;!-- start bundled java only --&gt;"
-            endTag=".*&lt;!-- end bundled java only --&gt;"/>
 
         <installer file="${basedir}/installer/greenstone3.jar"
@@ -54 +39 @@
 
             <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
-            <zipfileset dir="${basedir}/distribution/greenstone3" 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;"/>
+
+        <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="${lirk3.home}/packages/ant-installer/lib"
+                antLib="${lirk3.home}/packages/ant/lib"
+                validateConfig="true"
+                icons="bluecurve">
+
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
+            <zipfileset dir="${basedir}/components" includes="core.lzma"/>
+        </installer>
+
 
     </target>