Ignore:
Timestamp:
2010-01-27T08:19:07+13:00 (14 years ago)
Author:
oranfry
Message:

tidy-ups

Location:
main/trunk/release-kits/kits
Files:
8 edited

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"/>
Note: See TracChangeset for help on using the changeset viewer.