Changeset 21648

Show
Ignore:
Timestamp:
27.01.2010 08:19:07 (9 years ago)
Author:
oranfry
Message:

tidy-ups

Location:
main/trunk/release-kits
Files:
1 removed
8 modified
3 moved

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/cdrk2/ant-scripts/build.xml

    r21202 r21648  
    1919     
    2020    <!-- IMPORT OTHER ANT SCRIPTS --> 
    21     <import file="../core/ant-scripts/init.xml"/> 
    22     <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
     21    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
     22    <import file="${rk.home}/shared/greenstone2/ant-scripts/greenstone2-shared.xml"/> 
    2323 
    2424    <!-- figure out where the compiled software is coming from --> 
  • main/trunk/release-kits/kits/derk/ant-scripts/build.xml

    r21202 r21648  
    1919     
    2020    <!-- IMPORT OTHER ANT SCRIPTS --> 
    21     <import file="../core/ant-scripts/init.xml"/> 
     21    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
    2222 
    2323    <!-- THE MAIN TARGET --> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/build.xml

    r21632 r21648  
    1313 
    1414    <!-- IMPORT OTHER ANT SCRIPTS --> 
    15     <import file="${rk.home}/shared/core/ant-scripts/init.xml"/> 
     15    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
    1616    <import file="${rk.home}/shared/core/ant-scripts/operations-on-gli.xml"/> 
    17     <import file="${rk.home}/shared/greenstone2/ant-scripts/rk2-targets.xml"/> 
     17    <import file="${rk.home}/shared/greenstone2/ant-scripts/greenstone2-shared.xml"/> 
    1818 
    1919    <import file="compile.xml"/> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r21647 r21648  
    267267        <!-- delete unneeded files --> 
    268268        <delete dir="compiled/uninstaller" /> 
    269         <delete file="compiled/gli/.greenstonestore" /> 
    270269        <delete file="compiled/bin/java/SignedGatherer.jar" /> 
     270 
     271        <!-- tidy up gli --> 
     272        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></target> 
    271273 
    272274        <!-- mac and linux: insert export to cdrom package --> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

    r21632 r21648  
    1313 
    1414    <!-- IMPORT OTHER ANT SCRIPTS --> 
    15     <import file="${rk.home}/shared/core/ant-scripts/init.xml"/> 
     15    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
    1616    <import file="${rk.home}/shared/core/ant-scripts/operations-on-gli.xml"/> 
    17     <import file="${rk.home}/shared/greenstone2/ant-scripts/rk3-targets.xml"/> 
     17    <import file="${rk.home}/shared/greenstone2/ant-scripts/greenstone3-shared.xml"/> 
    1818 
    1919    <import file="compile.xml"/> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/create-components.xml

    r21630 r21648  
    33 
    44    <import file="${basedir}/compiled/resources/xml/components.xml"/> 
    5     <import file="${rk.home}/core/ant-scripts/init.xml"/> 
     5    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
    66 
    77    <target name="create-components"> 
  • main/trunk/release-kits/kits/sork2/ant-scripts/build.xml

    r21394 r21648  
    1919     
    2020    <!-- IMPORT OTHER ANT SCRIPTS --> 
    21     <import file="../core/ant-scripts/init.xml"/> 
    22     <import file="../core/ant-scripts/operations-on-gli.xml"/> 
    23     <import file="../greenstone2/ant-scripts/rk2-targets.xml"/> 
     21    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
     22    <import file="${rk.home}/shared/greenstone2/ant-scripts/greenstone2-shared.xml"/> 
     23    <import file="${rk.home}/shared/core/ant-scripts/operations-on-gli.xml"/> 
    2424 
    2525    <!-- THE MAIN TARGET --> 
  • main/trunk/release-kits/kits/sork3/ant-scripts/build.xml

    r21202 r21648  
    1919     
    2020    <!-- IMPORT OTHER ANT SCRIPTS --> 
    21     <import file="../core/ant-scripts/init.xml"/> 
    22     <import file="../core/ant-scripts/operations-on-gli.xml"/> 
    23     <import file="../greenstone3/ant-scripts/rk3-targets.xml"/> 
     21    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
     22    <import file="${rk.home}/shared/core/ant-scripts/operations-on-gli.xml"/> 
     23    <import file="${rk.home}/shared/greenstone3/ant-scripts/greenstone3-shared.xml"/> 
    2424 
    2525    <!-- helper constant --> 
     
    7373    <target name="insert-winbin"> 
    7474        <delete dir="distributions/${dist.dirname}/gs2build/bin/windows"/> 
    75         <svn> 
    76             <export srcurl="${svn.root}/main/${branch.path}/binaries/windows/bin" destPath="distributions/${dist.dirname}/gs2build/bin/windows"/> 
    77         </svn> 
     75        <exec executable="svn"> 
     76            <arg value="export"/> 
     77            <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin"/> 
     78            <arg value="distributions/${dist.dirname}/gs2build/bin/windows"/> 
     79        </exec> 
    7880        <delete dir="distributions/${dist.dirname}/gs2build/bin/windows/imagemagick"/> 
    7981        <delete dir="distributions/${dist.dirname}/gs2build/bin/windows/ghostscript"/> 
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r21634 r21648  
    313313    </target> 
    314314 
     315    <!-- target to set version numbers in gli --> 
     316    <target name="gli-set-version-numbers"> 
     317 
     318            <!-- DICTIOANRY FILES (AboutDialog.Date) --> 
     319            <echo level="info">Changing AboutDialog.Date in all dictionaries</echo> 
     320 
     321            <rsr file="${glibasedir}/classes/dictionary_ar.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.ar} ${current.year})" /> 
     322            <rsr file="${glibasedir}/classes/dictionary_ca.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.ca} de ${current.year})" /> 
     323            <rsr file="${glibasedir}/classes/dictionary_el.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.el} ${current.year})" /> 
     324            <rsr file="${glibasedir}/classes/dictionary_es.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.es} ${current.year})" /> 
     325            <rsr file="${glibasedir}/classes/dictionary_fr.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.fr} ${current.year})" /> 
     326            <rsr file="${glibasedir}/classes/dictionary_lv.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.lv} ${current.year})" /> 
     327            <rsr file="${glibasedir}/classes/dictionary_mr.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.mr} ${current.year})" /> 
     328            <rsr file="${glibasedir}/classes/dictionary_ro.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.ro} ${current.year})" /> 
     329            <rsr file="${glibasedir}/classes/dictionary_ru.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.ru} ${current.year})" /> 
     330            <rsr file="${glibasedir}/classes/dictionary_vi.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.vi} ${current.year})" /> 
     331            <rsr file="${glibasedir}/classes/dictionary_zh.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.zh} ${current.year})" /> 
     332            <rsr file="${glibasedir}/classes/dictionary.properties" pattern="AboutDialog.Date:.*" replacement="AboutDialog.Date:(${month.default} ${current.year})" /> 
     333 
     334            <!-- GLI GATHERER --> 
     335            <echo level="info">Changing version number in gli Gatherer</echo> 
     336            <rsr file="${glibasedir}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*&quot;(.*)&quot;" replacement="$1String PROGRAM_VERSION = &quot;${version}&quot;"/> 
     337 
     338            <!-- CONFIG XML FILES --> 
     339            <echo level="info">Changing configuration version in classes/xml/config.xml</echo> 
     340            <rsr file="${glibasedir}/classes/xml/config.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}$2"/> 
     341 
     342            <echo level="info">Changing configuration version in gli/classes/xml/configRemote.xml</echo> 
     343            <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}$2"/> 
     344 
     345    </target> 
     346 
     347    <!-- target to tidy gli up for distribution --> 
     348    <target name="gli-tidy-for-dist"> 
     349        <!-- delete unneeded things --> 
     350        <delete file="${glibasedir}/.greenstonestore"/>      
     351        <delete dir="${glibasedir}/classes/META-INF"/> 
     352        <delete dir="${glibasedir}/classes/org"/> 
     353        <delete dir="${glibasedir}/classes/xml"/> 
     354        <delete dir="${glibasedir}/classes/images"/> 
     355        <delete dir="${glibasedir}/metadata"/> 
     356        <delete dir="${glibasedir}/help"/> 
     357        <delete dir="${glibasedir}/jar"/> 
     358        <delete dir="${glibasedir}/lib"/> 
     359        <if><bool><not><equals arg1="windows" arg2="${rk.os}"/></not></bool> 
     360            <delete dir="${glibasedir}/winutil"/> 
     361        </if> 
     362    </target> 
     363 
     364 
    315365    <!-- target to archive and compress a given component --> 
    316366    <target name="create-component">