- Timestamp:
- 2011-01-19T10:06:54+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r23593 r23609 74 74 </if> 75 75 </if> 76 77 <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool> 78 <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac--> 79 <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 80 <property name="libpathvar" value="DYLD_LIBRARY_PATH"/> 81 <else> 82 <property name="libpathvar" value="LD_LIBRARY_PATH"/> 83 </else> 84 </if> 85 86 <property name="gnome.lib.dir" value="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}"/> 87 <property name="path.arg" value="PATH="${gnome.lib.dir}/bin:${env.PATH}""/> 88 <property name="cflags.arg" value="CFLAGS="-I${gnome.lib.dir}/include""/> 89 <property name="cxxflags.arg" value="CXXFLAGS="-I${gnome.lib.dir}/include""/> 90 <property name="cppflags.arg" value="CPPFLAGS="-I${gnome.lib.dir}/include""/> 91 <property name="ldflags.arg" value="LDFLAGS="-L${gnome.lib.dir}/lib""/> 92 <property name="pcpath.arg" value="PKG_CONFIG_PATH="${gnome.lib.dir}/lib/pkgconfig""/> 93 <property name="ldlpath.arg" value="${libpathvar}="${gnome.lib.dir}/lib""/> 94 95 <property name="allargs" value="${path.arg} ${cflags.arg} ${cxxflags.arg} ${cppflags.arg} ${ldflags.arg} ${pcpath.arg} ${ldlpath.arg}"/> 96 </if> 76 97 77 98 <!-- windows only --> … … 170 191 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 171 192 <arg line="--enable-apache-httpd"/> 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""/> 178 <arg line="LD_LIBRARY_PATH="${basedir}/compiled/ext/gnome-lib-minimal/linux/lib""/> 193 <arg line="${allargs}"/> 179 194 </exec> 180 195 … … 189 204 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 190 205 <arg line="--enable-apache-httpd"/> 191 <arg line="PATH="${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin:${env.PATH}""/> 192 <arg line="CFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include""/> 193 <arg line="CPPFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include""/> 194 <arg line="CXXFLAGS="-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include""/> 195 <arg line="LDFLAGS="-L${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib""/> 196 <arg line="PKG_CONFIG_PATH="${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib/pkgconfig""/> 197 <arg line="DYLD_LIBRARY_PATH="${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib""/> 206 <arg line="${allargs}"/> 198 207 </exec> 199 208 … … 206 215 <!-- mac and linux: compile --> 207 216 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 208 <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac-->209 <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>210 <property name="libpathvar" value="DYLD_LIBRARY_PATH"/>211 <else>212 <property name="libpathvar" value="LD_LIBRARY_PATH"/>213 </else>214 </if>215 216 217 <!-- make --> 217 218 <exec dir="${basedir}/compiled" executable="make" failonerror="true"> 218 <arg line="${l ibpathvar}="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/lib""/>219 <arg line="${ldlpath.arg}"/> 219 220 </exec> 220 221
Note:
See TracChangeset
for help on using the changeset viewer.