Changeset 17413 for release-kits

Timestamp:

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

Author:

oranfry

Message:

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

File:

• release-kits/wirk2/installer/build.xml (modified) (5 diffs)

release-kits/wirk2/installer/build.xml

@@ -15 +15 @@
     <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
     <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
+    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
 
     <!-- pick up the properties generated during the install pages -->
@@ -46 +47 @@
         <echo message="Creating Installation directory"/>
         <mkdir dir="${installDir}"/>
-
+        
         <!-- extract 7za tool -->
         <unzip src="${antinstaller.jar}" dest="${basedir}">
             <patternset><include name="7za.exe"/></patternset>
         </unzip>
-        
+
         <!-- install files -->
         <echo message="Installing Core Component"/>
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec>
+        <!--<sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>-->
         <delete file="core.lzma"/>
         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
@@ -102 +104 @@
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec>
+        <!--<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>-->
         <delete file="sourcecode.lzma"/>
             <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
@@ -119 +122 @@
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec>
+        <!--<sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>-->
         <delete file="imagemagick.lzma"/>
         <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/windows"/>
@@ -128 +132 @@
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
         <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec>
+        <!--<sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>-->
         <delete file="ghostscript.lzma"/>
         <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/windows"/>