svn commit: r328131 - in /jakarta/oro/trunk: build.properties build.xml

[df...@apache.org]

Author: dfs
Date: Mon Oct 24 11:47:52 2005
New Revision: 328131

URL: http://svn.apache.org/viewcvs?rev=328131&view=rev
Log:
Prefixed javac properties with javac. and added source and target
properties with 1.3 as the default (to avoid creating incompatible
binaries with 1.4/1.5 compilers).

Modified:
    jakarta/oro/trunk/build.properties
    jakarta/oro/trunk/build.xml

Modified: jakarta/oro/trunk/build.properties
URL: http://svn.apache.org/viewcvs/jakarta/oro/trunk/build.properties?rev=328131&r1=328130&r2=328131&view=diff
==============================================================================
--- jakarta/oro/trunk/build.properties (original)
+++ jakarta/oro/trunk/build.properties Mon Oct 24 11:47:52 2005
@@ -43,9 +43,11 @@
 javadoc.destdir=${top.dir}/docs/api
 final.name=${project}-${version}
 final.dir=${top.dir}/${final.name}
-debug=off
-optimize=on
-deprecation=off
+javac.debug=off
+javac.optimize=on
+javac.deprecation=off
+javac.source=1.3
+javac.target=1.3
 ant.home=.
 docs.src=${top.dir}/xdocs
 docs.dest=${top.dir}/docs

Modified: jakarta/oro/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/oro/trunk/build.xml?rev=328131&r1=328130&r2=328131&view=diff
==============================================================================
--- jakarta/oro/trunk/build.xml (original)
+++ jakarta/oro/trunk/build.xml Mon Oct 24 11:47:52 2005
@@ -118,9 +118,11 @@
         <javac srcdir="${build.src}"
             destdir="${build.dest}"
             excludes="examples/**,tools/**"
-            debug="${debug}"
-            deprecation="${deprecation}"
-            optimize="${optimize}">
+            source="${javac.source}"
+            target="${javac.target}"
+            debug="${javac.debug}"
+            deprecation="${javac.deprecation}"
+            optimize="${javac.optimize}">
             <and>
                 <filename name="**/*.java"/>
                 <not>
@@ -143,9 +145,11 @@
         <javac srcdir="${build.src}"
             destdir="${build.dest}"
             includes="examples/**"
-            debug="${debug}"
-            deprecation="${deprecation}"
-            optimize="${optimize}"/>
+            source="${javac.source}"
+            target="${javac.target}"
+            debug="${javac.debug}"
+            deprecation="${javac.deprecation}"
+            optimize="${javac.optimize}"/>
     </target>
 
     <!-- tools target.  Compiles the tool classes. -->
@@ -155,9 +159,11 @@
         <javac srcdir="${build.src}"
             destdir="${build.dest}"
             includes="tools/**"
-            debug="${debug}"
-            deprecation="${deprecation}"
-            optimize="${optimize}"/>
+            source="${javac.source}"
+            target="${javac.target}"
+            debug="${javac.debug}"
+            deprecation="${javac.deprecation}"
+            optimize="${javac.optimize}"/>
     </target>
     
     <!-- tests target.  Compiles and runs the unit tests. -->
@@ -166,9 +172,11 @@
             description="Compiles and runs the unit tests.">
         <javac srcdir="${build.src}/tests"
             destdir="${build.tests}"
-            debug="${debug}"
-            deprecation="${deprecation}"
-            optimize="${optimize}"/>
+            source="${javac.source}"
+            target="${javac.target}"
+            debug="${javac.debug}"
+            deprecation="${javac.deprecation}"
+            optimize="${javac.optimize}"/>
     </target>
 
     <!-- jar target.  Compiles the source directory and creates a .jar file -->



---------------------------------------------------------------------
To unsubscribe, e-mail: oro-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: oro-dev-help@jakarta.apache.org