Changeset 17444


Ignore:
Timestamp:
2008-10-02T09:36:25+13:00 (16 years ago)
Author:
oranfry
Message:

jre now part of core

Location:
release-kits
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r17396 r17444  
    4040            force="true"/>
    4141
    42         <!-- start full -->
    43         <target
    44             target="install-linux-jre"
    45             diskRequirement="@component.size.linux-java@"
    46             displayText=""
    47             defaultValue="true"/>
    48         <!-- end full -->
    49 
    5042        <target
    5143            target="install-source-code"

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

    r17437 r17444  
    4343        <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/linux/library"/>
    4444
     45        <!-- jre -->
     46        <move todir="${installDir}/packages/jre">
     47            <fileset dir="../@linux-java.extracted@"/>
     48        </move>
     49        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    4550
    4651        <echo>Setting Binaries to Executable</echo>
    … …  
    95100        <echo file="${installDir}/etc/installation.properties">#this file is just a placeholder for now</echo>
    96101
    97 
    98102        <echo message="Finished"/>
    99103
    … …  
    110114    </target>
    111115
    112     <target name="install-linux-jre">
    113         <echo>Installing bundled java</echo>
    114         <copy todir="${installDir}/packages/jre">
    115             <fileset dir="../@linux-java.extracted@"/>
    116         </copy>
    117         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    118     </target>
    119 
    120116    <target name="cleanuptarget"></target>
    121117   

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

    r17422 r17444  
    4242        <!-- start full -->
    4343        <target
    44             target="install-linux-java"
    45             diskRequirement="@component.size.linux-java@"
    46             defaultValue="true"
    47             displayText=""/>
    48 
    49         <target
    5044            target="install-tomcat"
    5145            diskRequirement="@component.size.tomcat@"

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

    r17422 r17444  
    5353        <echo/>
    5454
     55        <!-- jre -->
     56        <move todir="${installDir}/packages/jre">
     57            <fileset dir="../@linux-java.extracted@"/>
     58        </move>
     59        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     60
     61
    5562        <echo>Renaming greenstone3-build.xml back to build.xml</echo>
    5663        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
    … …  
    105112    </target>
    106113
    107     <target name="install-linux-java">
    108         <echo>Installing bundled java</echo>
    109         <copy todir="${installDir}/packages/jre">
    110             <fileset dir="../@linux-java.extracted@"/>
    111         </copy>
    112         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    113         <echo/>
    114     </target>
    115 
    116114    <target name="install-tomcat">
    117115        <echo>Installing Tomcat (packages/tomcat)</echo>

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

    r17381 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-imagemagick"
    5751            diskRequirement="@component.size.windows-java@"

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

    r17437 r17444  
    6161        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    6262        <delete file="core.comp"/>
     63
     64        <!-- jre -->
     65        <mkdir dir="${installDir}/packages"/>
     66        <move todir="${installDir}/packages/jre">
     67            <fileset dir="../@windows-java.extracted@"/>
     68        </move>
    6369       
    6470        <echo message="Creating admin and demo users"/>
    … …  
    110116    </target>
    111117
    112     <target name="install-windows-jre">
    113         <echo>Installing Java Runtime Environment</echo>
    114         <mkdir dir="${installDir}/packages"/>
    115         <copy todir="${installDir}/packages/jre">
    116             <fileset dir="../@windows-java.extracted@"/>
    117         </copy>
    118     </target>
    119    
    120118    <target name="install-imagemagick">
    121119        <echo message="Installing ImageMagick"/>

  • 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>
Note: See TracChangeset for help on using the changeset viewer.