Changeset 23599
- Timestamp:
- 2011-01-17T13:30:41+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r23443 r23599 223 223 <!-- If building a release then we want to adjust environment variables so that the support library can be see during compilation --> 224 224 <if><bool><isset property="use.support.lib"/></bool> 225 <if><bool><isset property="env.CFLAGS"/></bool> 226 <property name="cflags.arg" value="CFLAGS="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CFLAGS}""/> 227 <else> 228 <property name="cflags.arg" value="CFLAGS="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include""/> 229 </else> 230 </if> 231 <else> 232 <if><bool><isset property="env.CFLAGS"/></bool> 233 <property name="cflags.arg" value="CFLAGS="${env.CFLAGS}""/> 234 <else> 235 <property name="cflags.arg" value=" "/> 236 </else> 237 </if> 238 </else> 239 </if> 240 241 <if><bool><isset property="use.support.lib"/></bool> 242 <if><bool><isset property="env.CPPFLAGS"/></bool> 243 <property name="cppflags.arg" value="CPPFLAGS="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CPPFLAGS}""/> 244 <else> 245 <property name="cppflags.arg" value="CPPFLAGS="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include""/> 246 </else> 247 </if> 248 <else> 249 <if><bool><isset property="env.CPPFLAGS"/></bool> 250 <property name="cppflags.arg" value="CPPFLAGS="${env.CPPFLAGS}""/> 251 <else> 252 <property name="cppflags.arg" value=" "/> 253 </else> 254 </if> 255 </else> 256 </if> 257 258 <if><bool><isset property="use.support.lib"/></bool> 259 <if><bool><isset property="env.CXXFLAGS"/></bool> 260 <property name="cxxflags.arg" value="CXXFLAGS="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include ${env.CXXFLAGS}""/> 261 <else> 262 <property name="cxxflags.arg" value="CXXFLAGS="-I${basedir}/ext/gnome-lib/${os.bin.dir}/include""/> 263 </else> 264 </if> 265 <else> 266 <if><bool><isset property="env.CXXFLAGS"/></bool> 267 <property name="cxxflags.arg" value="CXXFLAGS="${env.CXXFLAGS}""/> 268 <else> 269 <property name="cxxflags.arg" value=" "/> 270 </else> 271 </if> 272 </else> 273 </if> 274 275 <if><bool><isset property="use.support.lib"/></bool> 276 <if><bool><isset property="env.LDFLAGS"/></bool> 277 <property name="ldflags.arg" value="LDFLAGS="-L${basedir}/ext/gnome-lib/${os.bin.dir}/lib ${env.LDFLAGS}""/> 278 <else> 279 <property name="ldflags.arg" value="LDFLAGS="-L${basedir}/ext/gnome-lib/${os.bin.dir}/lib""/> 280 </else> 281 </if> 282 <else> 283 <if><bool><isset property="env.LDFLAGS"/></bool> 284 <property name="ldflags.arg" value="LDFLAGS="${env.LDFLAGS}""/> 285 <else> 286 <property name="ldflags.arg" value=" "/> 287 </else> 288 </if> 289 </else> 290 </if> 291 292 <if><bool><isset property="use.support.lib"/></bool> 293 <if><bool><isset property="env.PATH"/></bool> 294 <property name="path.arg" value="PATH="${basedir}/ext/gnome-lib/${os.bin.dir}/bin:${env.PATH}""/> 295 <else> 296 <property name="path.arg" value="PATH="${basedir}/ext/gnome-lib/${os.bin.dir}/bin""/> 297 </else> 298 </if> 299 <else> 300 <if><bool><isset property="env.PATH"/></bool> 301 <property name="path.arg" value="PATH="${env.PATH}""/> 302 <else> 303 <property name="path.arg" value=" "/> 304 </else> 305 </if> 306 </else> 225 226 <property name="gnome-lib-dir" value="${basedir}/ext/gnome-lib-minimal/${os.bin.dir}"/> 227 228 <if><bool><isset property="env.CFLAGS"/></bool> 229 <property name="cflags.arg" value="CFLAGS="-I${gnome-lib-dir}/include ${env.CFLAGS}""/> 230 <else> 231 <property name="cflags.arg" value="CFLAGS="-I${gnome-lib-dir}/include""/> 232 </else> 233 </if> 234 235 <if><bool><isset property="env.CPPFLAGS"/></bool> 236 <property name="cppflags.arg" value="CPPFLAGS="-I${gnome-lib-dir}/include ${env.CPPFLAGS}""/> 237 <else> 238 <property name="cppflags.arg" value="CPPFLAGS="-I${gnome-lib-dir}/include""/> 239 </else> 240 </if> 241 242 <if><bool><isset property="env.CXXFLAGS"/></bool> 243 <property name="cxxflags.arg" value="CXXFLAGS="-I${gnome-lib-dir}/include ${env.CXXFLAGS}""/> 244 <else> 245 <property name="cxxflags.arg" value="CXXFLAGS="-I${gnome-lib-dir}/include""/> 246 </else> 247 </if> 248 249 <if><bool><isset property="env.LDFLAGS"/></bool> 250 <property name="ldflags.arg" value="LDFLAGS="-L${gnome-lib-dir}/lib ${env.LDFLAGS}""/> 251 <else> 252 <property name="ldflags.arg" value="LDFLAGS="-L${gnome-lib-dir}/lib""/> 253 </else> 254 </if> 255 256 <if><bool><isset property="env.PATH"/></bool> 257 <property name="path.arg" value="PATH="${gnome-lib-dir}/bin:${env.PATH}""/> 258 <else> 259 <property name="path.arg" value="PATH="${gnome-lib-dir}/bin""/> 260 </else> 261 </if> 262 263 <if><bool><isset property="env.PKG_CONFIG_PATH"/></bool> 264 <property name="pcpath.arg" value="PKG_CONFIG_PATH="${gnome-lib-dir}/lib/pkgconfig:${env.PKG_CONFIG_PATH}""/> 265 <else> 266 <property name="pcpath.arg" value="PKG_CONFIG_PATH="${gnome-lib-dir}/lib/pkgconfig""/> 267 </else> 268 </if> 269 270 <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 271 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}""/> 272 <else> 273 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${gnome-lib-dir}/lib""/> 274 </else> 275 </if> 276 277 <else> 278 <if><bool><isset property="env.CFLAGS"/></bool> 279 <property name="cflags.arg" value="CFLAGS="${env.CFLAGS}""/> 280 <else> 281 <property name="cflags.arg" value=" "/> 282 </else> 283 </if> 284 285 <if><bool><isset property="env.CPPFLAGS"/></bool> 286 <property name="cppflags.arg" value="CPPFLAGS="${env.CPPFLAGS}""/> 287 <else> 288 <property name="cppflags.arg" value=" "/> 289 </else> 290 </if> 291 292 <if><bool><isset property="env.CXXFLAGS"/></bool> 293 <property name="cxxflags.arg" value="CXXFLAGS="${env.CXXFLAGS}""/> 294 <else> 295 <property name="cxxflags.arg" value=" "/> 296 </else> 297 </if> 298 299 <if><bool><isset property="env.LDFLAGS"/></bool> 300 <property name="ldflags.arg" value="LDFLAGS="${env.LDFLAGS}""/> 301 <else> 302 <property name="ldflags.arg" value=" "/> 303 </else> 304 </if> 305 306 <if><bool><isset property="env.PATH"/></bool> 307 <property name="path.arg" value="PATH="${env.PATH}""/> 308 <else> 309 <property name="path.arg" value=" "/> 310 </else> 311 </if> 312 313 <if><bool><isset property="env.PKG_CONFIG_PATH"/></bool> 314 <property name="pcpath.arg" value="PKG_CONFIG_PATH="${env.PKG_CONFIG_PATH}""/> 315 <else> 316 <property name="pcpath.arg" value=" "/> 317 </else> 318 </if> 319 320 <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 321 <property name="ldlpath.arg" value="LD_LIBRARY_PATH="${env.LD_LIBRARY_PATH}""/> 322 <else> 323 <property name="ldlpath.arg" value=" "/> 324 </else> 325 </if> 326 </else> 307 327 </if> 308 328 … … 1509 1529 <arg line="${cxxflags.arg}"/> 1510 1530 <arg line="${path.arg}"/> 1531 <arg line="${pcpath.arg}"/> 1532 <arg line="${ldlpath.arg}"/> 1511 1533 </exec> 1512 1534 </target> … … 1832 1854 <arg line="${cxxflags.arg}"/> 1833 1855 <arg line="${path.arg}"/> 1856 <arg line="${pcpath.arg}"/> 1857 <arg line="${ldlpath.arg}"/> 1834 1858 </exec> 1835 1859 </target>
Note:
See TracChangeset
for help on using the changeset viewer.