Changeset 17367

Timestamp:

2008-09-25 10:36:59 (4 months ago)

Author:

oranfry

Message:

use the compressed components instead of the loose files

Files:

• release-kits/wirk3/ant-scripts/build.xml (modified) (3 diffs)
• release-kits/wirk3/ant-scripts/create-installer.xml (modified) (2 diffs)

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

@@ -15 +15 @@
-        <property name="bundled.version.tomcat" value="5.5.25"/>
-        <property name="bundled.version.ant" value="1.6.5"/>
+        <property name="bundled.version.imagemagick" value="6.4.3"/>
+        <property name="bundled.version.ghostscript" value="8.63"/>
-
-        <!-- the size of the resourse chunks to be put in the wrapped installer -->
@@ -30 +32 @@
-        <import file="compile.xml"/>
-        <import file="create-distribution.xml"/>
+        <import file="create-components.xml"/>
-        <import file="create-installer.xml"/>
-        <import file="wrap.xml"/>
@@ -37 +40 @@
-                <antcall target="compile"/>
-                <antcall target="create-distribution"/>
+                <antcall target="create-components"/>
-                <antcall target="create-installer"/>
-                <antcall target="wrap"/>
-        </target>
-        
+        
+
-</project>

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

@@ -20 +20 @@
-                        <fileset dir="${wirk3.home}/windows/installer-classes"/>
-                        <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
+                        <fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/>
+                        <fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/>
-                </copy>
-
-                <!-- some classes from jars, unpacked to be repacked into installer -->
-                <unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+                <unjar src="${wirk3.home}/ant-scripts/tasks/7-zip/7z.jar" dest="${basedir}/installer/classes"/>
+                <!--<unjar src="${wirk3.home}/ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar" dest="${basedir}/installer/classes"/>
+                <unjar src="${wirk3.home}/ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar" dest="${basedir}/installer/classes"/>-->
-                <delete dir="${basedir}/installer/classes/META-INF"/>
-
@@ -42 +47 @@
-
-                        <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-distribution/greenstone3" includes="**/*
+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="${wirk3.home}/packages/ant-installer/lib"
+                                        antLib="${wirk3.home}/packages/ant/lib"
+                                        validateConfig="true"
+                                        icons="bluecurve">
+                                <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+                                <zipfileset dir="${basedir}/components" includes="core.lzma,sourcecode.lzma" />
+                                <zipfileset dir="${basedir}/distribution/greenstone3" includes="LICENSE.txt" />
+                </installer>
-        </target>
+
-        
-</project>