Changeset 20937

Show
Ignore:
Timestamp:
13.11.2009 10:23:26 (11 years ago)
Author:
oranfry
Message:

collaped properties linux-java.extracted and windows-java.extracted into java.extracted

Location:
release-kits/shared
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/core/ant-scripts/init.xml

    r20600 r20937  
    3434        <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository --> 
    3535        <!-- change this info when the bundled version changes --> 
     36        <property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive --> 
     37 
    3638        <!-- linux --> 
    3739        <property name="linux-java.installer" value="jre_bin"/> 
    3840        <property name="bundled.version.linux-java" value="1.6.0_05"/> <!-- set this to the version number of java in the above archive --> 
    39         <property name="linux-java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive --> 
    4041        <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive --> 
    4142 
     
    4344        <property name="windows-java.installer" value="jre.exe"/> 
    4445        <property name="bundled.version.windows-java" value="1.6.0_07"/> <!-- set this to the version number of java in the above archive --> 
    45         <property name="windows-java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive --> 
    4646        <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive --> 
    4747 
     
    307307            <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/> 
    308308            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    309             <job pattern="@windows-java.extracted@" replacement="${windows-java.extracted}"/> 
    310             <job pattern="@linux-java.extracted@" replacement="${linux-java.extracted}"/> 
     309            <job pattern="@java.extracted@" replacement="${java.extracted}"/> 
    311310        </rsr> 
    312311 
  • release-kits/shared/greenstone2/installer/build.xml

    r20773 r20937  
    4242    <!-- determine if a bundled java exists --> 
    4343    <condition property="bundled.java.exists"> 
    44         <available file="../@linux-java.extracted@/bin/java"/> 
     44        <available file="../@java.extracted@/bin/java"/> 
    4545    </condition> 
    4646 
     
    6767        <mkdir dir="${installDir}/packages"/> 
    6868        <copy todir="${installDir}/packages/jre" failonerror="false"> 
    69             <fileset dir="../@linux-java.extracted@"/> 
     69            <fileset dir="../@java.extracted@"/> 
    7070        </copy> 
    7171        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>