Changeset 17597 for release-kits/wirk2

Timestamp:

2008-10-24T11:00:08+13:00 (16 years ago)

Author:

oranfry

Message:

untested changes to exclude sourcecode from the binary release, use nicer target names and icons

Location:

release-kits/wirk2

Files:

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

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

@@ -18 +18 @@
     <property name="rk.home" value="${wirk2.home}" />
     <property name="rk.os" value="windows" />
+    <property name="os.suffix" value="win32"/>
     
     <!-- IMPORT OTHER ANT SCRIPTS -->

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

@@ -5 +5 @@
         <antcall target="copy-installer-files"/>
         <antcall target="make-installer-files-concrete"><param name="java.os" value="windows"/></antcall> <!-- from rk2-targets -->
-        <antcall target="compile-installer"/>
+        <antcall target="compile-binary-installer"/> <!-- from init -->
+        <antcall target="compile-minimal-installer"/> <!-- from init -->
+        <antcall target="compile-source-installer"/> <!-- from init -->
     </target>
 
     <target name="copy-installer-files">
-        <echo>Copying installer files</echo>
+
         <mkdir dir="${basedir}/installer/classes"/>
         <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
@@ -27 +29 @@
         
     </target>
-
-    <target name="compile-installer">
-
-        <!-- binary installer -->
-        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-binary.xml"/>
-        <dcff file="${basedir}/installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start sourcecode --&gt;.*" endTag=".*&lt;!-- end sourcecode --&gt;.*" />     
-        <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
-            compress="true"
-            extractType="NonExtractor"
-            installConfig="${basedir}/installer/antinstall-config-binary.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="*.lzma" excludes="sourcecode.lzma" />
-        </installer>
-        
-        <!-- minimal installer -->
-        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-minimal.xml"/>
-        <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start bundled components --&gt;.*" endTag=".*&lt;!-- end bundled components --&gt;.*" />
-        <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start sourcecode --&gt;.*" endTag=".*&lt;!-- end sourcecode --&gt;.*" />
-        <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar"
-            compress="true"
-            extractType="NonExtractor"
-            installConfig="${basedir}/installer/antinstall-config-minimal.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>
-        
-    </target>
     
 </project>

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

@@ -72 +72 @@
             defaultValue="true" 
             displayText=""/>
+
         <target
             target="Installing Ghostscript"
@@ -94 +95 @@
     </page>
 
-    <page type="progress" name="progress" showTargets="true" displayText=""></page>
+    <page type="progress" name="progress" showTargets="true" displayText=""/>
 
 </installer>