You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/10/06 21:43:18 UTC

svn commit: r453743 - in /incubator/harmony/enhanced/classlib/trunk/modules/x-net: build.xml make/patternset.txt

Author: hindessm
Date: Fri Oct  6 12:43:18 2006
New Revision: 453743

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

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

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=453743&r1=453742&r2=453743
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Fri Oct  6 12:43:18 2006
@@ -26,9 +26,14 @@
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.x-net}/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.x-net.src.main.java}" />
+            <present targetdir="${hy.x-net.src.main.java}">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
     </fileset>
 
     <property file="../../make/depends.properties" />
@@ -51,8 +56,8 @@
         <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
-            srcdir="${hy.x-net.src.main.java}"
-            destdir="${hy.build}"
+               srcdir="${hy.x-net.src.main.java}"
+               destdir="${hy.build}"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}"