harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r618601 - in /harmony/enhanced/jdktools/trunk: make/properties.xml modules/jpda/build.xml modules/tools/build.xml
Date Tue, 05 Feb 2008 10:28:37 GMT
Author: tellison
Date: Tue Feb  5 02:28:36 2008
New Revision: 618601

URL: http://svn.apache.org/viewvc?rev=618601&view=rev
Log:
Allow passing command-line arguments into the make and javac calls.

Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/tools/build.xml

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?rev=618601&r1=618600&r2=618601&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Tue Feb  5 02:28:36 2008
@@ -38,6 +38,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="-nowarn -g" else="-nowarn -g:lines,source">
+        <equals arg1="${hy.cfg}" arg2="debug" />
+    </condition>
+
     <!-- Test run property -->
     <property name="hy.test.forkmode" value="perBatch" />
     <property name="hy.test.timeout" value="900000" />
@@ -200,6 +205,11 @@
     </condition>
     <property name="make.command" value="make" />
 
+    <condition property="make.arg" value="/nologo">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.arg" value="" />
+
     <property name="png.home" value="/usr" />
     <property name="lcms.home" value="/usr" />
     <property name="jpeg.home" value="/usr" />
@@ -337,7 +347,8 @@
         <attribute name="dir" />
         <attribute name="target" default="" />
         <sequential>
-            <echo> LOCAL MAKE DEFN L ${hy.drlvm} @{dir}</echo>
+            <echo>Making "@{target}" in @{dir}</echo>
+            <echo> LOCAL MAKE DEFN L ${hy.drlvm}</echo>
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">
@@ -353,6 +364,7 @@
                 <env key="HY_PLATFORM" value="${hy.platform}" />
                 <env key="HY_CFLAGS" value="${hy.cflags}" />
                 <env key="HY_ARCH_DEFINE" value="${hy.arch.define}" />
+                <arg line="${make.arg}" />
                 <arg line="@{target}" />
             </exec>
         </sequential>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=618601&r1=618600&r2=618601&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Tue Feb  5 02:28:36 2008
@@ -76,6 +76,8 @@
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
+            <compilerarg line="${build.compilerarg}" />
+
             <!-- HDK class library -->
             <classpath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">

Modified: harmony/enhanced/jdktools/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/build.xml?rev=618601&r1=618600&r2=618601&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/build.xml Tue Feb  5 02:28:36 2008
@@ -90,6 +90,8 @@
                target="${hy.javac.target}"
                debug="${hy.javac.debug}">
 
+            <compilerarg line="${build.compilerarg}" />
+
             <bootclasspath>
                 <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
                     <include name="**/*.jar" />



Mime
View raw message