Changeset 23645

Show
Ignore:
Timestamp:
27.01.2011 16:21:08 (9 years ago)
Author:
sjm84
Message:

More tidying and refactoring

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r23644 r23645  
    44    <target name="compile" depends="init,gs2-init"> 
    55    <!-- checkout greenstone2 (or gsdl if a pre-2.84 release is being created) and gli --> 
    6         <if> 
    7             <bool> 
    8                 <or> 
    9                     <equals arg1="${post.2.83.version}" arg2="true"/> 
    10                 </or> 
    11             </bool> 
     6        <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    127            <exec executable="svn"> 
    138                <arg value="checkout"/> 
     
    4944        <!-- mac or linux: get the support library --> 
    5045        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
    51             <!-- checkout the gnome support library extension--> 
    52             <if><bool><or> 
    53                   <equals arg1="${post.2.83.version}" arg2="true"/> 
    54             </or></bool> 
    55                 <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch --> 
     46            <!-- svn export the gnome support library extension--> 
     47            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    5648                <echo>EXPORTING GNOME LIB EXTENSION</echo> 
    5749                <exec executable="svn"> 
     
    10395             
    10496            <!-- unzip expat if the version is less that 2.84 --> 
    105             <if><bool><and> 
    106                 <equals arg1="${post.2.83.version}" arg2="false"/> 
    107             </and></bool> 
     97            <if><bool><equals arg1="${post.2.83.version}" arg2="false"/></bool> 
    10898                <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/> 
    10999            </if> 
     
    115105            <!-- get winbin from tags if the version is greater than 2.83 otherwise get it from trunk --> 
    116106            <if><bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool> 
    117                 <if><bool><and> 
    118                     <equals arg1="${post.2.83.version}" arg2="true"/> 
    119                 </and></bool> 
     107                <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    120108                     
    121109                    <exec executable="svn"> 
     
    232220        </if> 
    233221 
    234         <!-- Delete the entire gnome support library on Linux --> 
    235         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    236             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal"/> 
    237             <delete file="${basedir}/compiled/ext/gnome-lib-minimal-linux.tar.gz"/> 
    238         </if> 
    239  
    240         <!-- Delete all but the lib folder and the setup.bash script of the gnome support library on Mac --> 
    241         <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
    242             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/cascade-make"/> 
    243             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/packages"/> 
    244             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin"/> 
    245             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/etc"/> 
    246             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/include"/> 
     222        <!-- Delete all but the lib folder and the setup.bash script of the gnome support library --> 
     223        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
     224            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/bin"/> 
     225            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/include"/> 
    247226            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/setup.bat"/> 
    248             <delete file="${basedir}/compiled/ext/gnome-lib-minimal/CASCADE-MAKE.sh"/> 
    249             <delete file="${basedir}/compiled/ext/gnome-lib-minimal-darwin.tar.gz"/> 
    250         </if> 
    251          
     227            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/devel.bash"/> 
     228            <delete file="${basedir}/compiled/ext/gnome-lib-minimal-${os.shell}.tar.gz"/> 
     229        </if> 
     230 
    252231        <!-- insert the necessary additional xml parser versions--> 
    253232        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
     
    294273        <!-- build demo collection --> 
    295274        <!-- the envs on these execs simulate the environment when you run setup.bat --> 
    296         <if> 
    297             <bool> 
    298                 <equals arg1="${rk.os}" arg2="windows"/> 
    299             </bool>  
     275        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>    
    300276             
    301277            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl"> 
     
    378354            <delete dir="compiled/bin/linux/imagemagick"/> 
    379355 
    380             <if><bool><or> 
    381                   <equals arg1="${post.2.83.version}" arg2="true"/> 
    382             </or></bool> 
     356            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    383357                    <if><bool><equals arg1="${x64}" arg2="true"/></bool> 
    384358                    <exec executable="svn"> 
     
    430404            <delete dir="compiled/bin/darwin/ghostscript"/> 
    431405 
    432             <if><bool><and> 
    433                   <equals arg1="${post.2.83.version}" arg2="true"/> 
    434             </and></bool> 
     406            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    435407 
    436408                <exec executable="svn"> 
     
    480452            <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/> 
    481453 
    482             <if><bool><and> 
    483                   <equals arg1="${post.2.83.version}" arg2="true"/> 
    484             </and></bool> 
     454            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    485455                <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/> 
    486456                <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>