Changeset 23051

Show
Ignore:
Timestamp:
06.10.2010 15:31:34 (9 years ago)
Author:
sjm84
Message:

Reverted rk2 back to compiling up the gnome-lib (possibly temporarily) and updated the svn URLs for both rk2 and rk3

Location:
main/trunk/release-kits/kits
Files:
2 modified

Legend:

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

    r23032 r23051  
    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 
    5973                <echo>EXPORTING GNOME LIB EXTENSION</echo> 
    6074                <exec executable="svn"> 
     
    6983                </exec> 
    7084                <echo>DONE EXTRACTING GNOME LIB EXTENSION</echo> 
     85                --> 
    7186            </if> 
    7287        </if> 
     
    217232        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    218233            <delete dir="${basedir}/compiled/ext/gnome-lib"/> 
    219             <delete dir="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/> 
     234            <!--<delete dir="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/>--> 
    220235        </if> 
    221236 
     
    230245            <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/> 
    231246            <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/> 
    232             <delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/> 
     247            <!--<delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/>--> 
    233248        </if> 
    234249         
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r22941 r23051  
    4949                <exec executable="svn"> 
    5050                    <arg value="checkout"/> 
    51                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk"/> 
     51                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/> 
    5252                    <arg value="${basedir}/compiled/ext/gnome-lib"/> 
    5353                </exec>