Changeset 22821 for main/trunk/release-kits/kits
- Timestamp:
- 2010-08-31T15:47:38+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r22800 r22821 12 12 </or> 13 13 </bool> 14 14 <exec executable="svn"> 15 15 <arg value="checkout"/> 16 16 <arg value="${svn.root}/main/${branch.path}/greenstone2"/> 17 17 <arg value="${basedir}/compiled"/> 18 18 </exec> 19 19 <else> 20 20 <exec executable="svn"> … … 26 26 </if> 27 27 28 29 30 31 28 <exec executable="svn"> 29 <arg value="checkout"/> 30 <arg value="${svn.root}/main/${branch.path}/gli"/> 31 <arg value="${basedir}/compiled/gli"/> 32 32 </exec> 33 33 … … 47 47 <delete dir="${basedir}/compiled/gs2-server.app"/> 48 48 <delete dir="${basedir}/compiled/gli.app"/> 49 </if> 50 51 <!-- mac or linux: compile the support library --> 52 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 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> 58 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 59 </and></bool>--> 60 <exec executable="svn"> 61 <arg value="checkout"/> 62 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk"/> 63 <arg value="${basedir}/compiled/ext/gnome-lib"/> 64 </exec> 65 <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib"> 66 <arg value="-c"/> 67 <arg value="./CASCADE-MAKE.sh"/> 68 </exec> 69 <!--</if>--> 70 <echo>GNOME LIB EXTENSION END</echo> 49 71 </if> 50 72 … … 132 154 <!-- linux only --> 133 155 <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 134 135 156 <!-- add static to configure.in --> 136 157 <rsr file="${basedir}/compiled/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/> … … 146 167 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 147 168 <arg line="--enable-apache-httpd"/> 148 <env key="LDFLAGS" value="-static"/> 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="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/> 149 173 </exec> 150 174 … … 170 194 <!-- mac and linux: compile --> 171 195 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 172 173 196 <!-- make --> 174 <exec dir="${basedir}/compiled" executable="make" failonerror="true"/> 197 <exec dir="${basedir}/compiled" executable="make" failonerror="true"> 198 <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}"/> 199 <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 200 <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 201 <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/> 202 </exec> 175 203 176 204 <!-- make install -->
Note:
See TracChangeset
for help on using the changeset viewer.