Changeset 17583

Show
Ignore:
Timestamp:
23.10.2008 15:40:07 (11 years ago)
Author:
oranfry
Message:

HCI changes to installer for wirk2

Location:
release-kits/wirk2
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2/ant-scripts/compile.xml

    r17437 r17583  
    99        <antcall target="insert-perl" /> 
    1010        <antcall target="compile-c-code" /> 
    11         <antcall target="compile-search4j-windows" /> <!-- from rk2-targets --> 
    1211        <antcall target="compile-uninstaller" /> <!-- from rk2-targets --> 
    1312        <antcall target="build-demo-collection" /> 
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r17441 r17583  
    3636            <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/> 
    3737        </copy> 
    38         <copy todir="${basedir}/distributions/web/bin" file="${basedir}/gsdl/bin/search4j.exe"/> 
    3938        <copy todir="${basedir}/distributions/web" file="${basedir}/gsdl/bin/windows/server.exe"/> 
    4039    </target> 
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r17523 r17583  
    2929 
    3030    <target name="compile-installer"> 
    31          
     31 
     32        <!-- binary installer --> 
     33        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-binary.xml"/> 
     34        <dcff file="${basedir}/installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start sourcecode --&gt;.*" endTag=".*&lt;!-- end sourcecode --&gt;.*" />      
    3235        <installer file="${basedir}/installer/greenstone-${version}-win32.jar" 
    3336            compress="true" 
    3437            extractType="NonExtractor" 
    35             installConfig="${basedir}/installer/antinstall-config.xml" 
     38            installConfig="${basedir}/installer/antinstall-config-binary.xml" 
    3639            buildFile="${basedir}/installer/build.xml" 
    3740            antInstallLib="${wirk2.home}/packages/ant-installer/lib" 
     
    4144             
    4245            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    43             <zipfileset dir="${basedir}/components" includes="*.lzma" /> 
     46            <zipfileset dir="${basedir}/components" includes="*.lzma" excludes="sourcecode.lzma" /> 
    4447        </installer> 
    4548         
    46         <dcff file="${basedir}/installer/antinstall-config.xml" startTag=".*&lt;!-- start full --&gt;.*" endTag=".*&lt;!-- end full --&gt;.*" /> 
    47          
     49        <!-- minimal installer --> 
     50        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-minimal.xml"/> 
     51        <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start bundled components --&gt;.*" endTag=".*&lt;!-- end bundled components --&gt;.*" /> 
     52        <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start sourcecode --&gt;.*" endTag=".*&lt;!-- end sourcecode --&gt;.*" /> 
    4853        <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar" 
    4954            compress="true" 
    5055            extractType="NonExtractor" 
    51             installConfig="${basedir}/installer/antinstall-config.xml" 
     56            installConfig="${basedir}/installer/antinstall-config-minimal.xml" 
    5257            buildFile="${basedir}/installer/build.xml" 
    5358            antInstallLib="${wirk2.home}/packages/ant-installer/lib" 
  • release-kits/wirk2/installer/antinstall-config.xml

    r17576 r17583  
    4646 
    4747        <target 
     48            target="Looking For Previous Installation" 
     49            diskRequirement="x" 
     50            defaultValue="true" 
     51            displayText="x" 
     52            force="true" 
     53            hidden="true"/> 
     54 
     55        <target 
    4856            target="Installing Core System" 
    4957            diskRequirement="@component.size.core@" 
     
    5866            displayText=""/> 
    5967 
    60         <!-- start full --> 
     68        <!-- start bundled components --> 
    6169        <target 
    62             target="Install ImageMagick" 
     70            target="Installing ImageMagick" 
    6371            diskRequirement="@component.size.imagemagick@" 
    6472            defaultValue="true"  
    6573            displayText=""/> 
    66  
    6774        <target 
    6875            target="Installing Ghostscript" 
     
    7077            defaultValue="true"  
    7178            displayText=""/> 
    72  
     79        <!-- end bundled components --> 
     80         
     81        <!-- start sourcecode --> 
    7382        <target 
    7483            target="Installing Source Code" 
     
    7685            defaultValue="false" 
    7786            displayText=""/> 
    78         <!-- end full --> 
     87        <!-- end sourcecode --> 
    7988             
    8089    </page> 
     
    8594    </page> 
    8695 
    87     <page type="progress" name="progress" showTargets="false" displayText=""></page> 
     96    <page type="progress" name="progress" showTargets="true" displayText=""></page> 
    8897 
    8998</installer> 
  • release-kits/wirk2/installer/build.xml

    r17576 r17583  
    2929    <property name="installDir.local" refid="installDir.path"/> 
    3030     
    31     <target name="load-previous-props" if="is.overinstall"> 
     31    <target name="Looking For Previous Installation" if="is.overinstall"> 
    3232        <property file="${installDir}\etc\installation.properties"/> 
    3333    </target> 
    3434 
    35     <target name="Installing Core System" depends="load-previous-props"> 
     35    <target name="Installing Core System"> 
    3636 
    3737        <!-- figure out the start menu path (if not already set from previous installation) --> 
     
    6363        <!-- jre --> 
    6464        <mkdir dir="${installDir}/packages"/> 
    65         <copy todir="${installDir}/packages/jre"> 
     65        <copy todir="${installDir}/packages/jre" failonerror="false"> 
    6666            <fileset dir="../@windows-java.extracted@"/> 
    6767        </copy> 
     
    115115    </target> 
    116116 
    117     <target name="Install ImageMagick"> 
     117    <target name="Installing ImageMagick"> 
    118118        <echo message="Installing ImageMagick"/> 
    119119        <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>