harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r925752 - in /harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio/ modules/instrume...
Date Sun, 21 Mar 2010 11:18:52 GMT
Author: hindessm
Date: Sun Mar 21 11:18:51 2010
New Revision: 925752

URL: http://svn.apache.org/viewvc?rev=925752&view=rev
Log:
Make more consistent use of hy.javac compiler definition.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    harmony/enhanced/classlib/trunk/modules/applet/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/beans/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/regex/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/build.xml
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Sun Mar 21 11:18:51 2010
@@ -37,6 +37,7 @@
 
     <!-- Debug or release version -->
     <property name="hy.cfg" value="debug" />
+    <property name="hy.specification.version" value="1.5" />
 
     <!-- Javac properties -->
     <!-- Explicitly set to ECJ as the default compiler. -->
@@ -652,9 +653,12 @@ Alternatively, you can switch to another
     </macrodef>
    
     <presetdef name="hy.javac">
-        <javac target="${hy.javac.target}" source="${hy.javac.source}" 
-               compiler="${hy.javac.compiler}"
-               debug="${hy.javac.debug}" debuglevel="${hy.javac.debuglevel}">
+        <javac compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}"
+               debuglevel="${hy.javac.debuglevel}">
             <compilerarg line="${build.compilerarg}" />
         </javac>
     </presetdef>
@@ -704,12 +708,7 @@ Alternatively, you can switch to another
             
             <mkdir dir="@{destdir}" />
             
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+            <hy.javac destdir="@{destdir}">
 
                 <javac-elements />
 
@@ -723,7 +722,7 @@ Alternatively, you can switch to another
 
                 <classpath location="${hy.hdk}/build/test/support.jar" />
                 <classpath location="../../build/classes" />
-            </javac>
+            </hy.javac>
         </sequential>
     </macrodef>
 

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java" 
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java" 
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Sun Mar 21 11:18:51 2010
@@ -159,14 +159,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -175,7 +170,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Sun Mar 21 11:18:51 2010
@@ -73,13 +73,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -93,7 +88,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Sun Mar 21 11:18:51 2010
@@ -169,13 +169,8 @@ ${line.separator}For Fedora try: yum ins
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -189,7 +184,7 @@ ${line.separator}For Fedora try: yum ins
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="copy-resources" depends="-copy-win-resources">

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Sun Mar 21 11:18:51 2010
@@ -128,14 +128,9 @@ ${line.separator}For Fedora try: yum ins
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -144,7 +139,7 @@ ${line.separator}For Fedora try: yum ins
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
     
     <target name="build-native" depends="build-native-all" />

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Sun Mar 21 11:18:51 2010
@@ -72,15 +72,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-            srcdir="src/main/java"
-            destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-               
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">               
             <compilerarg line="${build.compilerarg}" />
 
             <bootclasspath>
@@ -88,7 +82,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
             
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Sun Mar 21 11:18:51
2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Sun Mar 21 11:18:51 2010
@@ -232,14 +232,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -248,7 +243,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
                
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Sun Mar 21 11:18:51 2010
@@ -65,14 +65,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -81,7 +76,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Sun Mar 21 11:18:51 2010
@@ -72,13 +72,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -92,7 +87,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Sun Mar 21 11:18:51 2010
@@ -72,14 +72,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -91,7 +86,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Sun Mar 21 11:18:51 2010
@@ -82,14 +82,11 @@
         <mkdir dir="../../build/classes" />
 
     	<!-- Ordinary classes -->
-        <javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="1.4"
-               target="1.4"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes"
+                  source="1.4"
+                  target="1.4">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -98,16 +95,11 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     	<!-- Java5 classes, with generics -->
-        <javac sourcepath=""
-               srcdir="src/main/java5"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java5"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -116,7 +108,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">
@@ -175,14 +167,11 @@
         <mkdir dir="bin/test" />
 
         <echo message="Compiling ${hy.module} tests" />
-        <javac srcdir="src/test/java"
-               destdir="bin/test"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="1.4" 
-               target="1.4"
-               debug="${hy.javac.debug}">
+        <hy.javac srcdir="src/test/java"
+                  destdir="bin/test"
+                  sourcepath=""
+                  source="1.4" 
+                  target="1.4">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -191,7 +180,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="run-tests" depends="test-jar">

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Sun Mar 21 11:18:51 2010
@@ -77,14 +77,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -93,7 +88,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Sun Mar 21 11:18:51 2010
@@ -66,14 +66,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               srcdir="src/main/java/common"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java/common"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -82,7 +77,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
     
     <target name="build-native" depends="build-native-all" />

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Sun Mar 21 11:18:51 2010
@@ -75,13 +75,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -95,7 +90,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Sun Mar 21 11:18:51 2010
@@ -76,14 +76,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -92,7 +87,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Sun Mar 21 11:18:51 2010
@@ -71,13 +71,8 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -91,7 +86,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
-            srcdir="src/main/java"
-            destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+        <hy.javac sourcepath=""
+                  srcdir="src/main/java"
+                  destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">

Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=925752&r1=925751&r2=925752&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Sun Mar 21 11:18:51 2010
@@ -62,14 +62,9 @@
 
         <mkdir dir="../../build/classes" />
 
-        <javac sourcepath=""
+        <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="../../build/classes"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+               destdir="../../build/classes">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -78,7 +73,7 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
     </target>
 
     <target name="findbugs" depends="build-jar">



Mime
View raw message