greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 17413

Show
Ignore:
Timestamp:
2008-10-01 10:19:46 (3 months ago)
Author:
oranfry
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • release-kits/wirk2/installer/build.xml

    r17381 r17413  
    1515        <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/> 
    1616        <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/> 
     17        <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/> 
    1718 
    1819        <!-- pick up the properties generated during the install pages --> 
    …… 
    4647                <echo message="Creating Installation directory"/> 
    4748                <mkdir dir="${installDir}"/> 
    48  
     49                 
    4950                <!-- extract 7za tool --> 
    5051                <unzip src="${antinstaller.jar}" dest="${basedir}"> 
    5152                        <patternset><include name="7za.exe"/></patternset> 
    5253                </unzip> 
    53                  
     54 
    5455                <!-- install files --> 
    5556                <echo message="Installing Core Component"/> 
    5657                <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip> 
    5758                <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec> 
     59                <!--<sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/>--> 
    5860                <delete file="core.lzma"/> 
    5961                <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
    …… 
    102104                <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip> 
    103105                <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec> 
     106                <!--<sevenzip task="decode" input="${basedir}/sourcecode.lzma" output="${basedir}/sourcecode.comp"/>--> 
    104107                <delete file="sourcecode.lzma"/> 
    105108                        <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/> 
    …… 
    119122                <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip> 
    120123                <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec> 
     124                <!--<sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/>--> 
    121125                <delete file="imagemagick.lzma"/> 
    122126                <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/windows"/> 
    …… 
    128132                <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip> 
    129133                <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec> 
     134                <!--<sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/>--> 
    130135                <delete file="ghostscript.lzma"/> 
    131136                <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/windows"/>