Show
Ignore:
Timestamp:
12.10.2010 13:55:33 (9 years ago)
Author:
sjm84
Message:

Modified the release kit to use the pre-compiled gnome libraries again after various fixes

Files:
1 modified

Legend:

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

    r23051 r23117  
    5757                <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 
    5858            </or></bool> 
    59                 <echo>COMPILING THE GNOME LIB EXTENSION</echo> 
    60                 <exec executable="svn"> 
    61                     <arg value="checkout"/> 
    62                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/> 
    63                     <arg value="${basedir}/compiled/ext/gnome-lib"/> 
    64                 </exec> 
    65  
    66                 <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib"> 
    67                     <arg value="-c"/> 
    68                     <arg value="./CASCADE-MAKE.sh"/> 
    69                 </exec> 
    70                 <echo>DONE COMPILING THE GNOME LIB EXTENSION</echo> 
    71                  
    72                 <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch 
     59                <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch --> 
    7360                <echo>EXPORTING GNOME LIB EXTENSION</echo> 
    7461                <exec executable="svn"> 
     
    8269                    <arg value="gnome-lib-${os.shell}.tar.gz"/> 
    8370                </exec> 
     71 
     72                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib"> 
     73                    <arg value="-c"/> 
     74                    <arg value="source devel.bash"/> 
     75                </exec> 
    8476                <echo>DONE EXTRACTING GNOME LIB EXTENSION</echo> 
    85                 --> 
    8677            </if> 
    8778        </if> 
     
    232223        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    233224            <delete dir="${basedir}/compiled/ext/gnome-lib"/> 
    234             <!--<delete dir="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/>--> 
     225            <delete dir="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/> 
    235226        </if> 
    236227 
     
    245236            <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/> 
    246237            <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/> 
    247             <!--<delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/>--> 
     238            <delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/> 
    248239        </if> 
    249240