Changeset 20056

Show
Ignore:
Timestamp:
21.07.2009 16:59:28 (10 years ago)
Author:
oranfry
Message:

the unified isntaller descriptors for all oses

Location:
release-kits/shared/greenstone2/installer
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/greenstone2/installer/antinstall-config.xml

    r20042 r20056  
    126126    </page> 
    127127 
    128     <!-- if they said yes above, set a password --> 
     128    <!-- only if they said yes above, set a password --> 
    129129    <page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages"> 
    130130        <comment name="admin-password-expl"/> 
  • release-kits/shared/greenstone2/installer/build.xml

    r20042 r20056  
    3535    <taskdef name="winprops" classname="com.orangevolt.tools.ant.Win32PropertiesTask" classpathref="project.classpath"/>  
    3636    <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/> 
    37     <taskdef name="sevenzip" classname="org.greenstone.anttasks.WindowsSevenZipWrapper" classpathref="project.classpath"/> 
    3837    <!-- /if --> 
    3938    <!-- if linux|mac --> 
     
    9089        <!-- start web --> 
    9190        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip> 
    92         <sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/> 
     91        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/core.lzma" output="${basedir}/core.comp"/><!-- /if --> 
     92        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec><!-- /if --> 
    9393        <delete file="core.lzma"/> 
    9494        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
     
    173173        <!-- start web --> 
    174174        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip> 
    175         <sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/> 
     175        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/imagemagick.lzma" output="${basedir}/imagemagick.comp"/><!-- /if --> 
     176        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec><!-- /if --> 
    176177        <delete file="imagemagick.lzma"/> 
    177178        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/${shell.name}"/> 
     
    194195        <!-- start web --> 
    195196        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip> 
    196         <sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/> 
     197        <!-- if linux|mac --><sevenzip task="decode" input="${basedir}/ghostscript.lzma" output="${basedir}/ghostscript.comp"/><!-- /if --> 
     198        <!-- if windows --><exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec><!-- /if --> 
    197199        <delete file="ghostscript.lzma"/> 
    198200        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/${shell.name}" />