Changeset 23583 for main/trunk/release-kits
- Timestamp:
- 2011-01-14T13:09:06+13:00 (13 years ago)
- Location:
- main/trunk/release-kits/kits/rk2/ant-scripts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r23578 r23583 70 70 <arg value="source devel.bash"/> 71 71 </exec> 72 72 73 <echo>DONE EXTRACTING GNOME LIB EXTENSION</echo> 73 74 </if> … … 169 170 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 170 171 <arg line="--enable-apache-httpd"/> 171 <arg line="PATH="${basedir}/compiled/ext/gnome-lib /linux/bin:${env.PATH}""/>172 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib /linux/include""/>173 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib /linux/include""/>174 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib /linux/include""/>175 <arg line="LDFLAGS="-static -L${basedir}/compiled/ext/gnome-lib /linux/lib""/>176 <arg line="PKG_CONFIG_PATH="${basedir}/compiled/ext/gnome-lib /linux/lib/pkgconfig""/>172 <arg line="PATH="${basedir}/compiled/ext/gnome-lib-minimal/linux/bin:${env.PATH}""/> 173 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include""/> 174 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include""/> 175 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include""/> 176 <arg line="LDFLAGS="-static -L${basedir}/compiled/ext/gnome-lib-minimal/linux/lib""/> 177 <arg line="PKG_CONFIG_PATH="${basedir}/compiled/ext/gnome-lib-minimal/linux/lib/pkgconfig""/> 177 178 </exec> 178 179 … … 187 188 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 188 189 <arg line="--enable-apache-httpd"/> 189 <arg line="PATH="${basedir}/compiled/ext/gnome-lib /darwin/bin:${env.PATH}""/>190 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib /darwin/include""/>191 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib /darwin/include""/>192 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib /darwin/include""/>193 <arg line="LDFLAGS="-L${basedir}/compiled/ext/gnome-lib /darwin/lib""/>190 <arg line="PATH="${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin:${env.PATH}""/> 191 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include""/> 192 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include""/> 193 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include""/> 194 <arg line="LDFLAGS="-L${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib""/> 194 195 </exec> 195 196 … … 212 213 <!-- make --> 213 214 <exec dir="${basedir}/compiled" executable="make" failonerror="true"> 214 <arg line="${libpathvar}="${basedir}/compiled/ext/gnome-lib /linux/lib""/>215 <arg line="${libpathvar}="${basedir}/compiled/ext/gnome-lib-minimal/linux/lib""/> 215 216 </exec> 216 217 … … 229 230 <!-- Delete the entire gnome support library on Linux --> 230 231 <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 231 <delete dir="${basedir}/compiled/ext/gnome-lib "/>232 <delete dir="${basedir}/compiled/ext/gnome-lib- linux.tar.gz"/>232 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal"/> 233 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal-linux.tar.gz"/> 233 234 </if> 234 235 235 236 <!-- Delete all but the lib folder and the setup.bash script of the gnome support library on Mac --> 236 237 <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 237 <delete dir="${basedir}/compiled/ext/gnome-lib /cascade-make"/>238 <delete dir="${basedir}/compiled/ext/gnome-lib /packages"/>239 <delete dir="${basedir}/compiled/ext/gnome-lib /darwin/bin"/>240 <delete dir="${basedir}/compiled/ext/gnome-lib /darwin/etc"/>241 <delete dir="${basedir}/compiled/ext/gnome-lib /darwin/include"/>242 <delete dir="${basedir}/compiled/ext/gnome-lib /darwin/share"/>243 <delete file="${basedir}/compiled/ext/gnome-lib /setup.bat"/>244 <delete file="${basedir}/compiled/ext/gnome-lib /CASCADE-MAKE.sh"/>245 <delete file="${basedir}/compiled/ext/gnome-lib- darwin.tar.gz"/>238 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/cascade-make"/> 239 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/packages"/> 240 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin"/> 241 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/etc"/> 242 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/include"/> 243 <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/share"/> 244 <delete file="${basedir}/compiled/ext/gnome-lib-minimal/setup.bat"/> 245 <delete file="${basedir}/compiled/ext/gnome-lib-minimal/CASCADE-MAKE.sh"/> 246 <delete file="${basedir}/compiled/ext/gnome-lib-minimal-darwin.tar.gz"/> 246 247 </if> 247 248 … … 382 383 <equals arg1="${post.2.83.version}" arg2="true"/> 383 384 </or></bool> 384 <exec executable="svn"> 385 <arg value="export"/> 386 <arg value="${svn.root}/main/${branch.path}/binaries/linux/imagemagick"/> 387 <arg value="compiled/bin/linux/imagemagick"/> 388 </exec> 389 385 <if><bool><equals arg1="${x64}" arg2="true"/></bool> 386 <exec executable="svn"> 387 <arg value="export"/> 388 <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-linux-x64.tar.gz"/> 389 <arg value="compiled/ext/imagemagick-linux-x64.tar.gz"/> 390 </exec> 391 392 <exec executable="tar" dir="compiled/ext"> 393 <arg value="xvzf"/> 394 <arg value="imagemagick-linux-x64.tar.gz"/> 395 </exec> 396 <delete file="compiled/bin/linux/imagemagick-linux-x64.tar.gz"/> 397 <else> 398 <exec executable="svn"> 399 <arg value="export"/> 400 <arg value="${svn.root}/main/${branch.path}/binaries/linux/imagemagick"/> 401 <arg value="compiled/bin/linux/imagemagick"/> 402 </exec> 403 </else> 404 </if> 390 405 <else> 391 406 <delete dir="compiled/bin/linux/wv"/> -
main/trunk/release-kits/kits/rk2/ant-scripts/components.xml
r22325 r23583 23 23 <include name="win32cfg.h"/> 24 24 </patternset> 25 25 26 <!-- imagemagick x64 --> 27 <patternset id="greenstone2.imagemagick-x64.component"> 28 <include name="ext/imagemagick"/> 29 <include name="ext/imagemagick/**/*"/> 30 </patternset> 31 26 32 <!-- imagemagick --> 27 33 <patternset id="greenstone2.imagemagick.component"> … … 51 57 </invert> 52 58 </patternset> 59 60 <!-- the core component - defined by antithesis (64-bit version) --> 61 <patternset id="greenstone2.core-x64.component"> 62 <invert> 63 <patternset refid="greenstone2.source.component"/> 64 <patternset refid="greenstone2.imagemagick-x64.component"/> 65 <patternset refid="greenstone2.ghostscript.component"/> 66 <patternset refid="greenstone2.apachehttpd.component"/> 67 </invert> 68 </patternset> 53 69 54 70 </project> -
main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml
r23210 r23583 5 5 6 6 <!-- imagemagick --> 7 <antcall target="create-component"><param name="component" value="imagemagick "/></antcall>7 <antcall target="create-component"><param name="component" value="imagemagick${extension-x64}"/></antcall> 8 8 9 9 <!-- apache httpd --> … … 17 17 18 18 <!-- core --> 19 <antcall target="create-component"><param name="component" value="core "/></antcall>19 <antcall target="create-component"><param name="component" value="core${extension-x64}"/></antcall> 20 20 21 21 </target>
Note:
See TracChangeset
for help on using the changeset viewer.