harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r453593 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio: build.xml make/patternset.txt
Date Fri, 06 Oct 2006 13:15:56 GMT
Author: hindessm
Date: Fri Oct  6 06:15:52 2006
New Revision: 453593

URL: http://svn.apache.org/viewvc?view=rev&rev=453593
Log:
Removing patternset

Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/patternset.txt
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=453593&r1=453592&r2=453593
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Fri Oct  6 06:15:52 2006
@@ -25,15 +25,26 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <property name="hy.nio.src.test.java.platform"
+              value="${hy.nio.src.test.java}/../${hy.os}" />
+
     <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.nio}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+        <or>
+            <present targetdir="${hy.nio.src.main.java}" />
+            <present targetdir="${hy.nio.src.main.java}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+            <present targetdir="${hy.nio.src.main.java.platform}" />
+            <present targetdir="${hy.nio.src.main.java.platform}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
     </fileset>
-
-        <property name="hy.nio.src.test.java.platform"
-                  value="${hy.nio.src.test.java}/../${hy.os}" />
-
+    
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
     <target name="test" depends="build, compile-tests, run-tests" />



Mime
View raw message