ceki 2004/12/15 13:55:48
Modified: . build.xml
Log:
- Simplification.
- We now output a helpful message in case jakart.oro classes are missing.
Revision Changes Path
1.123 +19 -12 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- build.xml 14 Dec 2004 20:50:39 -0000 1.122
+++ build.xml 15 Dec 2004 21:55:48 -0000 1.123
@@ -346,20 +346,23 @@
<include name="**/chainsaw/*.java"/>
</fileset>
- <!-- ================================================================= -->
- <!-- Runs Chainsaw -->
- <!-- ================================================================= -->
-
<target name="oroCheck" >
- <condition property="chainsaw-libraries-present">
- <and>
- <isset property="regexp.oro.jar" />
- <available file="${regexp.oro.jar}"/>
- </and>
- </condition>
+ <available classname="org.apache.oro.text.perl.Perl5Util"
property="chainsaw-libraries-present">
+ <classpath refid="compile.classpath"/>
+ </available>
+
+ <antcall target="oroWarning"/>
+
+ </target>
+ <target name="oroWarning" unless="chainsaw-libraries-present">
+ <echo>
+ Could not find jakarta-oro classes. Did you forget to set
+ "regexp.oro.jar" property in build.properties to point to
+ a valid jakarta.oro.jar file?
+ </echo>
</target>
-
+
<target name="chainsawCheck" depends="oroCheck"
if="chainsaw-libraries-present">
<echo message="Chainsaw dependant libraries present."/>
</target>
@@ -367,7 +370,11 @@
<target name="chainsawRunCheck" depends="chainsawCheck">
<fail unless="chainsaw-libraries-present" message="Chainsaw v2 needs
Jakarta ORO, and it appears your are missing the Jakarta ORO package. Please
check the build.properties file."/>
</target>
-
+
+ <!-- ================================================================= -->
+ <!-- Runs Chainsaw -->
+ <!-- ================================================================= -->
+
<target name="chainsaw" depends="chainsawRunCheck, build.chainsaw,
log4j.jar, chainsaw.jar" description="Builds and runs Chainsaw v2" >
<!-- Need to fork to avoid problems -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
