Changeset 17378

Timestamp:

2008-09-25T12:20:31+12:00 (16 years ago)

Author:

oranfry

Message:

use the individually zipped components instead of loose files

Location:

release-kits/wirk2/ant-scripts

Files:

• build.xml (modified) (3 diffs)
• create-installer.xml (modified) (3 diffs)
• wrap.xml (modified) (1 diff)

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

@@ -19 +19 @@
     <property name="rk.os" value="windows" />
 
+    <property name="bundled.version.imagemagick" value="6.4.3"/>
+    <property name="bundled.version.ghostscript" value="8.63"/>
+    
     <!-- IMPORT OTHER ANT SCRIPTS -->
     <import file="shared-ant-scripts/init.xml"/>
@@ -25 +28 @@
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
+    <import file="create-components.xml"/>
     <import file="create-installer.xml"/>
     <import file="wrap.xml"/>
@@ -32 +36 @@
         <antcall target="compile"/>
         <antcall target="create-distribution"/>
+        <antcall target="create-components"/>
         <antcall target="create-installer"/>
         <antcall target="wrap"/>

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

@@ -16 +16 @@
             <fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
             <fileset dir="${wirk2.home}/windows/installer-classes"/>
+            <fileset dir="${wirk2.home}/packages/7za" includes="7za.exe"/>
+            <fileset file="${basedir}/distributions/web/LICENSE.txt"/>
         </copy>
         <unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
@@ -24 +26 @@
 
     <target name="compile-installer">
+        
         <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
             compress="true"
@@ -35 +38 @@
             
             <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;.*" />
+        
+        <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar"
+            compress="true"
+            extractType="NonExtractor"
+            installConfig="${basedir}/installer/antinstall-config.xml"
+            buildFile="${basedir}/installer/build.xml"
+            antInstallLib="${wirk2.home}/packages/ant-installer/lib"
+            antLib="${wirk2.home}/packages/ant/lib"
+            validateConfig="true"
+            icons="bluecurve">
+            
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+            <zipfileset dir="${basedir}/components" includes="core.lzma" />
         </installer>
         

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

@@ -100 +100 @@
     <target name="link-wrapper">
         <exec executable="link" dir="${basedir}/wrapped-installer/build">
-            <arg line="/OUT:..\greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
+            <arg line="/OUT:..\Greenstone-${version}-win32.exe gdi32.lib advapi32.lib shell32.lib user32.lib libsearch4j.obj wrapper.obj wrapper.res"/>
         </exec>
     </target>