harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r416046 - /incubator/harmony/enhanced/classlib/trunk/make/properties.xml
Date Wed, 21 Jun 2006 17:36:06 GMT
Author: hindessm
Date: Wed Jun 21 10:36:06 2006
New Revision: 416046

URL: http://svn.apache.org/viewvc?rev=416046&view=rev
Log:
Allow -Dbuild.module=mod1,mod2,... to work.  Many thanks to Matt
Benson for teaching me more useful ant stuff (again).

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=416046&r1=416045&r2=416046&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Wed Jun 21 10:36:06 2006
@@ -95,6 +95,11 @@
     </condition>
     <property name="shlib.suffix" value=".so" />
 
+    <condition property="make.command" value="nmake.exe">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.command" value="make" />
+
     <target name="echo" depends="svn-prop" >
         <echo>
 
@@ -129,6 +134,7 @@
 
   exe.suffix = ${exe.suffix}
   shlib.suffix = ${shlib.suffix}
+  make.command = ${make.command}
 
 
 The following property is only set if the "svn-prop" target has been
@@ -180,24 +186,17 @@
             <fileset dir="modules">
                 <include name="*/build.xml" />
                 <exclude name="rmi*/build.xml" />
-                <include name="*/make/build.xml" />
-                <exclude name="rmi*/make/build.xml" />
             </fileset>
             <fileset dir="modules">
                 <include name="${hy.rmi.module}/build.xml" />
-                <include name="${hy.rmi.module}/make/build.xml" />
             </fileset>
         </subant>
     </target>
 
     <target name="call-modules-one" if="build.module">
         <subant target="${target}">
-            <fileset dir="modules">
-                <include name="${build.module}/build.xml" />
-                <include name="${build.module}/make/build.xml" />
-            </fileset>
+            <dirset dir="modules" includes="${build.module}" />
         </subant>
     </target>
-            
 
 </project>



Mime
View raw message