Changeset 21388


Ignore:
Timestamp:
2009-12-22T11:02:52+13:00 (14 years ago)
Author:
oranfry
Message:

combining release kits into one

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

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/bin/rk

    r21386 r21388  
    5858
    5959#create the command
    60 toexec="ant -lib `pwd`/installer/classes -f $RK_HOME/$rk_name/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
     60toexec="ant -lib `pwd`/installer/classes -f $RK_HOME/kits/$rk_name/ant-scripts/build.xml -Dbasedir=`pwd` -D$rk_name.home=$RK_HOME"
    6161
    6262#pass on the arguments

  • main/trunk/release-kits/kits/rk2/ant-scripts/build.xml

    r21311 r21388  
    1717
    1818    <!-- IMPORT OTHER ANT SCRIPTS -->
    19     <import file="../core/ant-scripts/init.xml"/>
    20     <import file="../core/ant-scripts/operations-on-gli.xml"/>
    21     <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
     19    <import file="../../../shared/core/ant-scripts/init.xml"/>
     20    <import file="../../../shared/core/ant-scripts/operations-on-gli.xml"/>
     21    <import file="../../../shared/greenstone2/ant-scripts/rk2-targets.xml"/>
    2222
    2323    <import file="compile.xml"/>

  • main/trunk/release-kits/shared/core/ant-scripts/init.xml

    r21311 r21388  
    5555
    5656            <!-- our classes -->
    57             <fileset dir="${rk.home}/core">
     57            <fileset dir="${rk.home}/shared/core">
    5858                <include name="ant-tasks/antelope/AntelopeTasks_3.4.2.jar"/>
    5959                <include name="ant-tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
    … …  
    9090   
    9191        <!-- DATES IN DIFFERENT LANGUAGES -->
    92         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/>
    93         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ca.Dates.${current.month}" outputProperty="month.ca"/>
    94         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="el.Dates.${current.month}" outputProperty="month.el"/>
    95         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="es.Dates.${current.month}" outputProperty="month.es"/>
    96         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="fr.Dates.${current.month}" outputProperty="month.fr"/>
    97         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="lv.Dates.${current.month}" outputProperty="month.lv"/>
    98         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="mr.Dates.${current.month}" outputProperty="month.mr"/>
    99         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ro.Dates.${current.month}" outputProperty="month.ro"/>
    100         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ru.Dates.${current.month}" outputProperty="month.ru"/>
    101         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="vi.Dates.${current.month}" outputProperty="month.vi"/>
    102         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="zh.Dates.${current.month}" outputProperty="month.zh"/>
    103         <get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="default.Dates.${current.month}" outputProperty="month.default"/>
     92        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/>
     93        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="ca.Dates.${current.month}" outputProperty="month.ca"/>
     94        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="el.Dates.${current.month}" outputProperty="month.el"/>
     95        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="es.Dates.${current.month}" outputProperty="month.es"/>
     96        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="fr.Dates.${current.month}" outputProperty="month.fr"/>
     97        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="lv.Dates.${current.month}" outputProperty="month.lv"/>
     98        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="mr.Dates.${current.month}" outputProperty="month.mr"/>
     99        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="ro.Dates.${current.month}" outputProperty="month.ro"/>
     100        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="ru.Dates.${current.month}" outputProperty="month.ru"/>
     101        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="vi.Dates.${current.month}" outputProperty="month.vi"/>
     102        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="zh.Dates.${current.month}" outputProperty="month.zh"/>
     103        <get-property-value propertiesFile="${rk.home}/shared/core/lib/dates.properties" propertyName="default.Dates.${current.month}" outputProperty="month.default"/>
    104104        <!--
    105105        <echo level="info">Current Date</echo>
    … …  
    207207            installConfig="installer/antinstall-config-binary.xml"
    208208            buildFile="installer/build-binary.xml"
    209             antInstallLib="${rk.home}/core/ant-installer/lib"
    210             antLib="${rk.home}/core/ant/lib"
     209            antInstallLib="${rk.home}/shared/core/ant-installer/lib"
     210            antLib="${ant.home}/lib"
    211211            validateConfig="true"
    212212            icons="bluecurve">
    … …  
    233233            buildFile="installer/build-cdrom.xml"
    234234            antInstallLib="${rk.home}/core/ant-installer/lib"
    235             antLib="${rk.home}/core/ant/lib"
     235            antLib="${ant.home}/lib"
    236236            validateConfig="true"
    237237            icons="bluecurve">
    … …  
    249249            implementation="sun"
    250250            encoding="UTF-8"
    251             src="${rk.home}/core/language-strings"
     251            src="${rk.home}/shared/core/language-strings"
    252252            dest="${basedir}/installer/classes/resources"/>
    253253
    … …  
    334334        <!-- copile to build -->
    335335        <javac
    336             srcdir="${rk.home}/core/uninstaller"
     336            srcdir="${rk.home}/shared/core/uninstaller"
    337337            destdir="${basedir}/compiled/uninstaller/build" />
    338338
    … …  
    340340        <native2ascii
    341341            implementation="sun"
    342             src="${rk.home}/core/language-strings"
     342            src="${rk.home}/shared/core/language-strings"
    343343            dest="${basedir}/compiled/uninstaller/build/resources"/>
    344344
    … …  
    346346        <jar
    347347            destfile="${basedir}/compiled/uninst.jar"
    348             manifest="${rk.home}/core/uninstaller/manifest.mf"
     348            manifest="${rk.home}/shared/core/uninstaller/manifest.mf"
    349349            basedir="${basedir}/compiled/uninstaller/build" />
    350350
    … …  
    356356        <!-- linux and mac -->
    357357        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    358             <copy file="${rk.home}/core/uninstaller/Uninstall.sh" todir="distributions/web"/>
     358            <copy file="${rk.home}/shared/core/uninstaller/Uninstall.sh" todir="distributions/web"/>
    359359
    360360        <!-- windows -->
    361361        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    362             <copy file="${rk.home}/core/uninstaller/Uninstall.bat" todir="distributions/web"/>
     362            <copy file="${rk.home}/shared/core/uninstaller/Uninstall.bat" todir="distributions/web"/>
    363363
    364364        <!-- else fail -->
Note: See TracChangeset for help on using the changeset viewer.