Changeset 17381 for release-kits/wirk2


Ignore:
Timestamp:
2008-09-25T12:21:31+12:00 (16 years ago)
Author:
oranfry
Message:

new logic for installing components which are now individually compressed

Location:
release-kits/wirk2/installer
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • release-kits/wirk2/installer/antinstall-config.xml

    r17281 r17381  
    4646            displayText=""/>
    4747
    48         <!-- start bundled java only -->
     48        <!-- start full -->
    4949        <target
    50             target="install-java"
     50            target="install-windows-jre"
    5151            diskRequirement="@component.size.windows-java@"
    5252            defaultValue="true"
    5353            displayText=""/>
    54         <!-- end bundled java only -->
     54       
     55        <target
     56            target="install-imagemagick"
     57            diskRequirement="@component.size.windows-java@"
     58            defaultValue="true"
     59            displayText=""/>
     60        <target
     61            target="install-ghostscript"
     62            diskRequirement="@component.size.windows-java@"
     63            defaultValue="true"
     64            displayText=""/>
    5565
    5666        <target
    … …  
    5969            defaultValue="false"
    6070            displayText=""/>
    61 
     71        <!-- end full -->
     72           
    6273    </page>
    6374
    … …  
    6778    </page>
    6879
    69 
    7080    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
    7181

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

    r17311 r17381  
    4646        <echo message="Creating Installation directory"/>
    4747        <mkdir dir="${installDir}"/>
     48
     49        <!-- extract 7za tool -->
     50        <unzip src="${antinstaller.jar}" dest="${basedir}">
     51            <patternset><include name="7za.exe"/></patternset>
     52        </unzip>
    4853       
    4954        <!-- install files -->
    50         <echo message="Installing Files"/>
    51         <unzip src="${antinstaller.jar}" dest="${installDir}">
    52             <patternset>
    53 
    54                 <include name="gli/**/*"/>
    55                 <include name="bin/**/*"/>
    56                 <include name="cgi-bin/**/*"/>
    57                 <include name="etc/**/*"/>
    58                 <include name="mappings/**/*"/>
    59                 <include name="images/**/*"/>
    60                 <include name="perllib/**/*"/>
    61                 <include name="indexers/**/*"/>
    62                 <include name="macros/**/*"/>
    63                 <include name="collect/**/*"/>
    64 
    65                 <include name="LICENSE.txt"/>
    66                 <include name="READMEar.txt"/>
    67                 <include name="READMEes.txt"/>
    68                 <include name="READMEen.txt"/>
    69                 <include name="READMEfr.txt"/>
    70                 <include name="READMEru.txt"/>
    71                 <include name="setup.bat"/>
    72                 <include name="server.exe"/>
    73                 <include name="Uninstall.jar"/>
    74                 <include name="gsdlsite.cfg"/>
    75 
    76             </patternset>
    77         </unzip>
    78         <echo/>
     55        <echo message="Installing Core Component"/>
     56        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="core.lzma"/></patternset></unzip>
     57        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x core.lzma"/></exec>
     58        <delete file="core.lzma"/>
     59        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
     60        <delete file="core.comp"/>
    7961       
    8062        <echo message="Creating admin and demo users"/>
    … …  
    11799    <!-- Source -->
    118100    <target name="install-source-code" depends="">
    119 
    120101        <echo message="Installing Source Code"/>
    121         <unzip src="${antinstaller.jar}" dest="${installDir}">
    122             <patternset>
    123                 <include name="common-src/**/*"/>
    124                 <include name="runtime-src/**/*"/>
    125                 <include name="build-src/**/*"/>
    126                 <include name="packages/**/*"/>
    127             </patternset>
    128         </unzip>
    129        
     102        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
     103        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x sourcecode.lzma"/></exec>
     104        <delete file="sourcecode.lzma"/>
     105            <unzip src="${basedir}/sourcecode.comp" dest="${installDir}"/>
     106        <delete file="sourcecode.comp"/>
    130107    </target>
    131108
    132     <target name="install-java">
    133         <echo>Installing bundled java</echo>
     109    <target name="install-windows-jre">
     110        <echo>Installing Java Runtime Environment</echo>
    134111        <mkdir dir="${installDir}/packages"/>
    135112        <copy todir="${installDir}/packages/jre">
    136             <fileset dir="../@java.extracted@"/>
     113            <fileset dir="../@windows-java.extracted@"/>
    137114        </copy>
     115    </target>
     116   
     117    <target name="install-imagemagick">
     118        <echo message="Installing ImageMagick"/>
     119        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
     120        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x imagemagick.lzma"/></exec>
     121        <delete file="imagemagick.lzma"/>
     122        <unzip src="${basedir}/imagemagick.comp" dest="${installDir}/bin/windows"/>
     123        <delete file="imagemagick.comp"/>
     124    </target>
     125
     126    <target name="install-ghostscript">
     127        <echo message="Installing GhostScript"/>
     128        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
     129        <exec dir="${basedir}" executable="${basedir}/7za.exe"><arg line="x ghostscript.lzma"/></exec>
     130        <delete file="ghostscript.lzma"/>
     131        <unzip src="${basedir}/ghostscript.comp" dest="${installDir}/bin/windows"/>
     132        <delete file="ghostscript.comp"/>
    138133    </target>
    139134   
    … …  
    157152        <shortcut
    158153            file="${startmenu.path}\Greenstone Editor for Metadata Sets (GEMS).lnk"
    159             execute="${installDir}\gli\gems4gs3.bat"
     154            execute="${installDir}\gli\gems.bat"
    160155            workingDirectory="${installDir}\gli"
    161156            iconFile="${installDir}\images\icon.ico"
Note: See TracChangeset for help on using the changeset viewer.