Changeset 17337 for release-kits/wirk3

Timestamp:

2008-09-19T09:26:22+12:00 (16 years ago)

Author:

oranfry

Message:

making the java installation the same for win as it is on linux

File:

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

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

@@ -11 +11 @@
 
         <echo>Getting things ready to compile the installer</echo>
-        <mkdir dir="${basedir}/installer/resources"/>
 
         <!-- the installer descriptors -->
@@ -30 +29 @@
 
     <target name="compile-installer">
+        <!--<exec executable="7z.exe" dir="${basdir}/distribution"><arg line="-t7z -mx=9 greenstone3 greenstone3.lzma"/></exec>-->
 
-        <installer file="${basedir}/installer/Greenstone-${version}-win32-with-java.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}/distribution/greenstone3" includes="**/*" />
-            
-        </installer>
-
-        <!-- delete the 'bundled java only' lines from the installer config -->
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
-
-        <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
+        <installer file="${basedir}/installer/Greenstone-${version}-win32.jar"
                 compress="true"
                 extractType="NonExtractor"