java/buildconf/build-props.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 28e67b179b552a6cd7bfdb62fc9ce7d497cf2cc6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 16 13:06:37 2009 +0100
modifying spacewalk-java build propetries to enable f12 builds
problem is caused by the ant-contrib-1.0-0.10.b2.fc12.noarch, that changes the
location of ant-contrib.jar
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 8d6576c..0b89284 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -65,8 +65,12 @@
regexp tyrex jmock jmock-cglib strutstest gsbase jfreechart jmap
postgresql-jdbc" />
+ <condition property="ant-contrib.path" value="ant/ant-contrib"
else="ant-contrib">
+ <available file="/usr/share/java/ant/ant-contrib.jar"/>
+ </condition>
+
<property name="build.jar.dependencies"
- value="ant ant-junit ant-contrib antlr
+ value="ant ant-junit ${ant-contrib.path} antlr
${common.jar.dependencies} tanukiwrapper jasper5-compiler jasper5-runtime
concurrent" />
@@ -82,7 +86,7 @@
regexp tyrex jmock jmock-cglib strutstest gsbase" / -->
<property name="install.build.jar.dependencies"
- value="ant ant/ant-junit ant-contrib antlr
+ value="ant ant/ant-junit ${ant-contrib.path} antlr
${install.common.jar.dependencies} tanukiwrapper" />
<property name="install.run.jar.dependencies"
Show replies by date