Changeset 17444 for release-kits/wirk3

Show
Ignore:
Timestamp:
02.10.2008 09:36:25 (11 years ago)
Author:
oranfry
Message:

jre now part of core

Location:
release-kits/wirk3/installer
Files:
2 modified

Legend:

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

    r17376 r17444  
    4848        <!-- start full --> 
    4949        <target 
    50             target="install-windows-jre" 
    51             diskRequirement="@component.size.windows-java@" 
    52             defaultValue="true" 
    53             displayText=""/> 
    54          
    55         <target 
    5650            target="install-tomcat" 
    5751            diskRequirement="@component.size.tomcat@" 
  • release-kits/wirk3/installer/build.xml

    r17416 r17444  
    2626    <pathconvert targetos="unix" property="installDir.unix" refid="installDir.path"/> 
    2727     
    28  
    2928    <!-- load windows properties --> 
    3029    <winprops/> 
     
    6362        <unzip src="${basedir}/core.comp" dest="${installDir}"/> 
    6463        <delete file="core.comp"/> 
    65          
     64 
     65        <!-- jre --> 
     66        <mkdir dir="${installDir}/packages"/> 
     67        <move todir="${installDir}/packages/jre"> 
     68            <fileset dir="../@windows-java.extracted@"/> 
     69        </move> 
     70 
    6671        <!-- rename greenstone3-build.xml back to build.xml --> 
    6772        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
     
    158163    </target> 
    159164     
    160     <target name="install-windows-jre"> 
    161         <echo>Installing Java Runtime Environment</echo> 
    162         <mkdir dir="${installDir}/packages"/> 
    163         <copy todir="${installDir}/packages/jre"> 
    164             <fileset dir="../@windows-java.extracted@"/> 
    165         </copy> 
    166     </target> 
    167      
    168165    <target name="cleanuptarget"> 
    169166    </target>