Changeset 22938

Show
Ignore:
Timestamp:
22.09.2010 10:37:25 (9 years ago)
Author:
sjm84
Message:

A few fixes to the release kits and the removal of the binary wvWare

Files:
1 modified

Legend:

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

    r22851 r22938  
    5252        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
    5353            <!-- checkout the gnome support library extension--> 
    54             <echo>GNOME LIB EXTENSION START</echo> 
    55             <!--<if><bool><and> 
    56                 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 
    57                 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 
     54            <if><bool><or> 
     55                <equals arg1="${branch.path}" arg2="trunk"/> 
     56                <equals arg1="${branch.path}" arg2="tags/stable"/> 
    5857                <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 
    59             </and></bool>--> 
     58            </or></bool> 
     59                <echo>COMPILING GNOME LIB EXTENSION</echo> 
    6060                <exec executable="svn"> 
    6161                    <arg value="checkout"/> 
     
    6767                    <arg value="./CASCADE-MAKE.sh"/> 
    6868                </exec> 
    69             <!--</if>--> 
    70             <echo>GNOME LIB EXTENSION END</echo> 
     69                <echo>DONE COMPILING GNOME LIB EXTENSION</echo> 
     70            </if> 
    7171        </if> 
    7272         
     
    167167            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 
    168168                <arg line="--enable-apache-httpd"/> 
    169                 <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}"/>  
    170                 <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    171                 <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    172                 <env key="CPPFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    173                 <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/> 
     169                <arg line="PATH=&quot;${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}&quot;"/> 
     170                <arg line="CFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/> 
     171                <arg line="CPPFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/> 
     172                <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/> 
     173                <arg line="LDFLAGS=&quot;-static -L${basedir}/compiled/ext/gnome-lib/linux/lib&quot;"/> 
    174174            </exec> 
    175175 
    176176            <!-- add -static to makefiles --> 
    177             <rsr file="${basedir}/compiled/build-src/packages/wv/wv-gs/GNUmakefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 
    178177            <rsr file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static"/> 
    179178            <rsr file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static"/> 
     
    185184            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 
    186185                <arg line="--enable-apache-httpd"/> 
    187                 <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/darwin/bin:${env.PATH}"/>  
    188                 <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    189                 <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    190                 <env key="CPPFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    191                 <env key="LDFLAGS" value="-L${basedir}/compiled/ext/gnome-lib/darwin/lib"/> 
     186                <arg line="PATH=&quot;${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}&quot;"/> 
     187                <arg line="CFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/> 
     188                <arg line="CPPFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/> 
     189                <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/> 
     190                <arg line="LDFLAGS=&quot;-L${basedir}/compiled/ext/gnome-lib/linux/lib&quot;"/> 
    192191            </exec> 
    193192 
     
    201200        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
    202201            <!-- make --> 
    203             <exec dir="${basedir}/compiled" executable="make" failonerror="true"> 
    204                 <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/${os.shell}/bin:${env.PATH}"/>  
    205                 <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
    206                 <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
    207                 <env key="CPPFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
    208                 <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/${os.shell}/lib"/> 
    209             </exec> 
     202            <exec dir="${basedir}/compiled" executable="make" failonerror="true"/> 
    210203 
    211204            <!-- make install --> 
     
    370363            <!-- grab imagemagick and wv binaries --> 
    371364            <delete dir="compiled/bin/linux/imagemagick"/> 
    372             <delete dir="compiled/bin/linux/wv"/> 
    373  
    374             <if><bool><and> 
    375                 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 
    376                 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 
     365 
     366            <if><bool><or> 
     367                <equals arg1="${branch.path}" arg2="trunk"/> 
     368                <equals arg1="${branch.path}" arg2="tags/stable"/> 
    377369                <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 
    378             </and></bool> 
    379  
     370            </or></bool> 
    380371                <exec executable="svn"> 
    381372                    <arg value="export"/> 
     
    384375                </exec> 
    385376 
    386                 <exec executable="svn"> 
    387                     <arg value="export"/> 
    388                     <arg value="${svn.root}/main/${branch.path}/binaries/linux/wv"/> 
    389                     <arg value="compiled/bin/linux/wv"/> 
    390                 </exec> 
    391  
    392377                <else> 
     378                    <delete dir="compiled/bin/linux/wv"/>    
    393379                    <exec executable="svn"> 
    394380                        <arg value="export"/>