dfs 2004/06/14 21:03:20
Modified: . TODO build.xml
Log:
Added conditional compilation of .java package based on availability
of java.util.regex.Pattern class. This was done entirely in the
build.xml file and should not be confused with the conditional
compilation that will be necessary inside of java source files to
support JDK 1.1 and J2ME.
Revision Changes Path
1.22 +1 -4 jakarta-oro/TODO
Index: TODO
===================================================================
RCS file: /home/cvs/jakarta-oro/TODO,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TODO 15 Jun 2004 02:56:42 -0000 1.21
+++ TODO 15 Jun 2004 04:03:19 -0000 1.22
@@ -16,9 +16,6 @@
PatternMatchingEngineFactory
o Add conditional compilation for 1.1, J2ME, 1.2+
- This must be done before a 2.1 release so that there is no J2SE 1.4
- from the org.apache.oro.text.regex.java package (although that can
- be done in the build file by excluding the directory).
o unit tests
1.15 +14 -2 jakarta-oro/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-oro/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 15 Jun 2004 02:46:31 -0000 1.14
+++ build.xml 15 Jun 2004 04:03:20 -0000 1.15
@@ -89,6 +89,9 @@
</target>
<!-- compile target. Compiles the library classes only -->
+ <condition property="java.util.regex.available">
+ <available classname="java.util.regex.Pattern"/>
+ </condition>
<target name="compile" depends="prepare"
description="Compiles the library classes only.">
@@ -97,7 +100,16 @@
excludes="examples/**,tools/**"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}"/>
+ optimize="${optimize}">
+ <and>
+ <filename name="**/*.java"/>
+ <not>
+ <selector unless="java.util.regex.available">
+ <filename name="org/apache/oro/text/java/**"/>
+ </selector>
+ </not>
+ </and>
+ </javac>
</target>
<!-- lib target. Preserved for backward compatibility. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
