Changeset 17932


Ignore:
Timestamp:
2008-11-27T12:05:27+13:00 (15 years ago)
Author:
oranfry
Message:

made use of rsrs ability to take a fileset

Location:
release-kits
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • release-kits/mark3/ant-scripts/compile.xml

    r17898 r17932  
    7272    <target name="prepare-documentation">
    7373        <mkdir dir="compiled/gsdl-manuals"/>
    74         <svn javahl="false">
     74        <svn>
    7575            <checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
    7676            <checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
    7777        </svn>
    78         <javac srcdir="compiled/gsdl-manuals/shared"
    79               destdir="compiled/gsdl-manuals/shared"
    80               debug="on">
     78        <javac
     79                srcdir="compiled/gsdl-manuals/shared"
     80                destdir="compiled/gsdl-manuals/shared"
     81                debug="on">
    8182            <include name="*.java"/>
    8283        </javac>
    … …  
    106107</project>
    107108
     109

  • release-kits/shared/ant-scripts/init.xml

    r17898 r17932  
    308308       
    309309        <!-- put the concrete values of things in the config -->
    310         <rsr file="${basedir}/installer/antinstall-config.xml">
     310        <rsr>
     311            <fileset dir="${basedir}/installer" includes="*.xml"/>
    311312            <job pattern="@version@" replacement="${version}"/>
    312313            <job pattern="@component.size.core@" replacement="${component.size.core}"/>
    … …  
    317318            <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/>
    318319            <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/>
    319         </rsr>
    320 
    321         <rsr file="${basedir}/installer/build.xml">
    322             <job pattern="@version@" replacement="${version}"/>
    323320            <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    324321            <job pattern="@windows-java.extracted@" replacement="${windows-java.extracted}"/>
    … …  
    327324
    328325        <!-- put the concrete values of things in the text -->
    329 
    330         <!-- default -->
    331         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties">
     326        <rsr>
     327            <fileset dir="${basedir}/installer/classes/resources" includes="*.properties"/>
    332328            <job pattern="@version@" replacement="${version}"/>
    333329            <job pattern="@version.major@" replacement="${version.major}"/>
    … …  
    341337        </rsr>
    342338
    343         <!-- es -->
    344         <rsr file="${basedir}/installer/classes/resources/LanguagePack_es.properties">
    345             <job pattern="@version@" replacement="${version}"/>
    346             <job pattern="@version.major@" replacement="${version.major}"/>
    347             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    348             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    349             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    350             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    351             <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    352             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    353             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
    354         </rsr>
    355 
    356         <!-- es_EU -->
    357         <rsr file="${basedir}/installer/classes/resources/LanguagePack_es_EU.properties">
    358             <job pattern="@version@" replacement="${version}"/>
    359             <job pattern="@version.major@" replacement="${version.major}"/>
    360             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    361             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    362             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    363             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    364             <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    365             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    366             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
    367         </rsr>
    368 
    369         <!-- de -->
    370         <rsr file="${basedir}/installer/classes/resources/LanguagePack_de.properties">
    371             <job pattern="@version@" replacement="${version}"/>
    372             <job pattern="@version.major@" replacement="${version.major}"/>
    373             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    374             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    375             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    376             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    377             <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    378             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    379             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
    380         </rsr>
    381 
    382         <!-- fr -->
    383         <rsr file="${basedir}/installer/classes/resources/LanguagePack_fr.properties">
    384             <job pattern="@version@" replacement="${version}"/>
    385             <job pattern="@version.major@" replacement="${version.major}"/>
    386             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    387             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    388             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    389             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    390             <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    391             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    392             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
    393         </rsr>
    394        
    395         <!-- ru -->
    396         <rsr file="${basedir}/installer/classes/resources/LanguagePack_ru.properties">
    397             <job pattern="@version@" replacement="${version}"/>
    398             <job pattern="@version.major@" replacement="${version.major}"/>
    399             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    400             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    401             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    402             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    403             <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    404             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    405             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
    406         </rsr>
    407 
    408         <!-- zh -->
    409         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh.properties">
    410             <job pattern="@version@" replacement="${version}"/>
    411             <job pattern="@version.major@" replacement="${version.major}"/>
    412             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    413             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    414             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    415             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    416             <job pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    417             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    418             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
    419         </rsr>
    420 
    421 
    422339    </target>
    423340

  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r17898 r17932  
    5555        <echo level="info">Dropping gsdl docs  into distribution</echo>
    5656        <copy todir="${basedir}/distributions/web" overwrite="true">
    57             <fileset dir="${wirk2.home}/greenstone2/docs"/>
     57            <fileset dir="${wirk2.home}/greenstone2/docs" includes="*.txt"/>
    5858        </copy>
    5959    </target>
Note: See TracChangeset for help on using the changeset viewer.