Changeset 17299

Show
Ignore:
Timestamp:
17.09.2008 10:15:25 (11 years ago)
Author:
oranfry
Message:

make use of the new style of rsr

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

    r17275 r17299  
    5353 
    5454        <!-- put the concrete values of things in the config --> 
    55         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/> 
    56         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.core@" replacement="${component.size.core}"/> 
    57         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.sourcecode@" replacement="${component.size.sourcecode}"/> 
    58         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.linux-java@" replacement="${component.size.linux-java}"/> 
    59         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.windows-java@" replacement="${component.size.windows-java}"/> 
    60         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/> 
    61         <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.ant@" replacement="${component.size.ant}"/> 
     55        <rsr file="${basedir}/installer/antinstall-config.xml"> 
     56            <job pattern="@version@" replacement="${version}"/> 
     57            <job pattern="@component.size.core@" replacement="${component.size.core}"/> 
     58            <job pattern="@component.size.sourcecode@" replacement="${component.size.sourcecode}"/> 
     59            <job pattern="@component.size.linux-java@" replacement="${component.size.linux-java}"/> 
     60            <job pattern="@component.size.windows-java@" replacement="${component.size.windows-java}"/> 
     61            <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/> 
     62            <job pattern="@component.size.ant@" replacement="${component.size.ant}"/> 
     63        </rsr> 
    6264 
    63         <rsr file="${basedir}/installer/build.xml" pattern="@version@" replacement="${version}"/> 
    64         <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    65         <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
     65        <rsr file="${basedir}/installer/build.xml"> 
     66            <job pattern="@version@" replacement="${version}"/> 
     67            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
     68            <job pattern="@java.extracted@" replacement="${linux-java.extracted}"/> 
     69        </rsr> 
    6670 
    6771        <!-- put the concrete values of things in the text --> 
    6872        <!-- default --> 
    69         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/> 
    70         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    71         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
    72         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 
     73        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties"> 
     74            <job pattern="@version@" replacement="${version}"/> 
     75            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
     76            <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
     77            <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 
     78        </rsr> 
    7379 
    7480        <!-- chinese --> 
    75         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/> 
    76         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/> 
    77         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
    78         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 
     81        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties"> 
     82            <job pattern="@version@" replacement="${version}"/> 
     83            <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
     84            <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/> 
     85            <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/> 
     86        </rsr> 
    7987 
    8088        <!-- os specific replacements -->