Changeset 22938 for main/trunk/release-kits/kits/rk2
- Timestamp:
- 2010-09-22T10:37:25+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r22851 r22938 52 52 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 53 53 <!-- 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"/> 58 57 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 59 </and></bool>--> 58 </or></bool> 59 <echo>COMPILING GNOME LIB EXTENSION</echo> 60 60 <exec executable="svn"> 61 61 <arg value="checkout"/> … … 67 67 <arg value="./CASCADE-MAKE.sh"/> 68 68 </exec> 69 <!--</if>-->70 < echo>GNOME LIB EXTENSION END</echo>69 <echo>DONE COMPILING GNOME LIB EXTENSION</echo> 70 </if> 71 71 </if> 72 72 … … 167 167 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 168 168 <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="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}""/> 170 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib/linux/include""/> 171 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib/linux/include""/> 172 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib/linux/include""/> 173 <arg line="LDFLAGS="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib""/> 174 174 </exec> 175 175 176 176 <!-- add -static to makefiles --> 177 <rsr file="${basedir}/compiled/build-src/packages/wv/wv-gs/GNUmakefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />178 177 <rsr file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static"/> 179 178 <rsr file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static"/> … … 185 184 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 186 185 <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="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}""/> 187 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib/linux/include""/> 188 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib/linux/include""/> 189 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib/linux/include""/> 190 <arg line="LDFLAGS="-L${basedir}/compiled/ext/gnome-lib/linux/lib""/> 192 191 </exec> 193 192 … … 201 200 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 202 201 <!-- 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"/> 210 203 211 204 <!-- make install --> … … 370 363 <!-- grab imagemagick and wv binaries --> 371 364 <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"/> 377 369 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 378 </and></bool> 379 370 </or></bool> 380 371 <exec executable="svn"> 381 372 <arg value="export"/> … … 384 375 </exec> 385 376 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 392 377 <else> 378 <delete dir="compiled/bin/linux/wv"/> 393 379 <exec executable="svn"> 394 380 <arg value="export"/>
Note:
See TracChangeset
for help on using the changeset viewer.
