harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r582166 - in /harmony/enhanced: classlib/trunk/make/build-java.xml classlib/trunk/make/properties.xml drlvm/trunk/build/make/targets/build.java.xml drlvm/trunk/build/make/targets/test.common.xml
Date Fri, 05 Oct 2007 09:42:41 GMT
Author: varlax
Date: Fri Oct  5 02:42:40 2007
New Revision: 582166

URL: http://svn.apache.org/viewvc?rev=582166&view=rev
Log:
Fixed HARMONY-4845 consistent options for Java compilation everywhere in classlib and drlvm

Modified:
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=582166&r1=582165&r2=582166&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Fri Oct  5 02:42:40 2007
@@ -122,15 +122,9 @@
         </fail>
         <mkdir dir="${build.output}" />
 
-        <javac compiler="${hy.javac.compiler}"
-               destdir="${build.output}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}"
+        <hy.javac destdir="${build.output}"
                includeAntRuntime="no">
             
-            <compilerarg line="${build.compilerarg}" />
-            
             <src path="modules/accessibility/src/main/java/" />
             <src path="modules/annotation/src/main/java/" />
             <src path="modules/applet/src/main/java" />
@@ -187,7 +181,7 @@
                     <include name="**/mx4j.jar" />
                 </fileset>
             </bootclasspath>
-        </javac>
+        </hy.javac>
 
         <call-modules target="build" />
     </target>

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=582166&r1=582165&r2=582166&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Fri Oct  5 02:42:40 2007
@@ -41,6 +41,11 @@
         <equals arg1="${hy.cfg}" arg2="debug" />
     </condition>
 
+    <!-- Local variable tables should be available in debug, and unavailable in release
modes. -->
+    <condition property="build.compilerarg" value="-warn:none" else="-warn:none -g:lines,source">
+        <equals arg1="${hy.cfg}" arg2="debug" />
+    </condition>
+
     <!-- During packaging, these files must be copied into the meta-inf dir -->
     <fileset id="hy.required.metainf-files" dir="${hy.hdk}">
         <include name="NOTICE" />
@@ -258,8 +263,6 @@
     </condition>
     <property name="jpeg.home" value="/usr" />
     
-    <property name="build.compilerarg" value="-warn:none" />
-
     <!-- default property for call-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
     <property name="exclude.module" value="nothing" />
@@ -313,6 +316,7 @@
   hy.javac.source = ${hy.javac.source}
   hy.javac.debug  = ${hy.javac.debug}
   hy.javac.maxmem = ${hy.javac.maxmem}
+  build.compilerarg = ${build.compilerarg}
 
 Harmony test properties:
 
@@ -509,5 +513,12 @@
            </concat>
        </sequential>
    </macrodef>
+   
+   <presetdef name="hy.javac">
+       <javac target="${hy.javac.target}" source="${hy.javac.source}" 
+                compiler="${hy.javac.compiler}" debug="${hy.javac.debug}">
+           <compilerarg line="${build.compilerarg}" />
+       </javac>
+   </presetdef>
 
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml?rev=582166&r1=582165&r2=582166&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/build.java.xml Fri Oct  5 02:42:40 2007
@@ -23,15 +23,11 @@
         <patternset id="java.classes.pattern"  includes="**/*.class"/>
         <patternset id="java.source.pattern"  includes="**/*.java"/>
 
-        <javac srcdir="${java.source.dir}" destdir="${java.build.dir}"
-               source="${hy.javac.source}" target="${hy.javac.target}"
-               debug="${hy.java.debug}"
-               compiler="${hy.javac.compiler}">
-            <!--src refid="java.source" /-->
+        <hy.javac srcdir="${java.source.dir}" destdir="${java.build.dir}">
             <patternset refid="java.source.pattern" />
             <classpath refid="java.class.path"/>
             <bootclasspath refid="java.boot.class.path"/>
-        </javac>
+        </hy.javac>
         <fileset id="java.sources.fileset" dir="${java.source.dir}">
             <patternset refid="java.source.pattern" />
         </fileset>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml?rev=582166&r1=582165&r2=582166&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/test.common.xml Fri Oct  5 02:42:40 2007
@@ -35,12 +35,10 @@
         <element name="javac-elements" implicit="yes" optional="yes"/>
         <sequential>
             <mkdir dir="@{dest}" />
-            <javac srcdir="@{src}" destdir="@{dest}" 
-                target="${hy.javac.target}" source="${hy.javac.source}" 
-                compiler="${hy.javac.compiler}" debug="${hy.javac.debug}">
+            <hy.javac srcdir="@{src}" destdir="@{dest}">
                 <include name="**/*.java"/>
                 <javac-elements/>
-            </javac>
+            </hy.javac>
         </sequential>
     </macrodef>
     



Mime
View raw message