Changeset 17414 for release-kits

Timestamp:

2008-10-01T10:19:52+13:00 (16 years ago)

Author:

oranfry

Message:

for windows, going back to the commandline tool method for compressing and extracting lzma

Location:

release-kits/wirk2/ant-scripts

Files:

• create-components.xml (modified) (4 diffs)
• create-installer.xml (modified) (1 diff)

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

@@ -79 +79 @@
     
     <target name="compress-core-component">
-        <sevenzip task="encode" input="components/core.comp" output="components/core-anttask.lzma" dictionnary="26"/>
+        <!-- <sevenzip task="encode" input="${basedir}/components/core.comp" output="${basedir}/components/core.lzma" dictionnary="26"/> -->
+        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 core.lzma core.comp"/></exec>
     </target>
     
@@ -95 +96 @@
         
     <target name="compress-imagemagick-component">
-        <sevenzip task="encode" input="components/imagemagick.comp" output="components/imagemagick.lzma" dictionnary="26"/>
+        <!-- <sevenzip task="encode" input="${basedir}/components/imagemagick.comp" output="${basedir}/components/imagemagick.lzma" dictionnary="26"/> -->
+        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 imagemagick.lzma imagemagick.comp"/></exec>
     </target>
     
@@ -111 +113 @@
         
     <target name="compress-ghostscript-component">
-        <sevenzip task="encode" input="components/ghostscript.comp" output="components/ghostscript.lzma" dictionnary="26"/>
+        <!-- <sevenzip task="encode" input="${basedir}/components/ghostscript.comp" output="${basedir}/components/ghostscript.lzma" dictionnary="26"/> -->
+        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 ghostscript.lzma ghostscript.comp"/></exec>
     </target>
     
@@ -129 +132 @@
         
     <target name="compress-sourcecode-component">
-        <sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/>
+        <!-- <sevenzip task="encode" input="${basedir}/components/sourcecode.comp" output="${basedir}/components/sourcecode.lzma" dictionnary="26"/> -->
+        <exec executable="7z.exe" dir="components"><arg line="a -t7z -mx=9 sourcecode.lzma sourcecode.comp"/></exec>
     </target>
     

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

@@ -19 +19 @@
             <fileset file="${basedir}/distributions/web/LICENSE.txt"/>
         </copy>
+        
         <unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+        
+        <unjar src="${wirk2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+        <delete dir="${basedir}/installer/classes/META-INF"/>
+        
         <unjar src="${wirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
         <delete dir="${basedir}/installer/classes/META-INF"/>
+        
     </target>