Changeset 17521

Show
Ignore:
Timestamp:
10.10.2008 15:11:22 (11 years ago)
Author:
oranfry
Message:

add the size of java to the core component size, and use the chinese language pack with the new name

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r17451 r17521  
    1616 
    1717        <!-- core greenstone2 system --> 
    18         <length property="component.bytesize.core" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 
     18        <length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 
     19        <if><bool><equals arg1="${java.os}" arg2="windows"/></bool> 
     20            <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/> 
     21        <else><if><bool><equals arg1="${java.os}" arg2="linux"/></bool> 
     22            <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/> 
     23        <else> 
     24            <fail>Bad java.os specified in make-installer-files-concrete</fail> 
     25        </else></if></else></if> 
    1926        <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/> 
    2027        <property name="component.size.core" value="${component.megabytesize.core} MB"/> 
     
    4047            <job pattern="@component.size.core@" replacement="${component.size.core}"/> 
    4148            <job pattern="@component.size.sourcecode@" replacement="${component.size.sourcecode}"/> 
    42             <job pattern="@component.size.linux-java@" replacement="${component.size.linux-java}"/> 
    43             <job pattern="@component.size.windows-java@" replacement="${component.size.windows-java}"/> 
    4449            <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/> 
    4550            <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/> 
     
    6570 
    6671        <!-- chinese --> 
    67         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties"> 
     72        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh.properties"> 
    6873            <job pattern="@version@" replacement="${version}"/> 
    6974            <job pattern="@java.min.version@" replacement="${java.min.version}"/>