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:21:42 UTC

svn commit: r453732 - in /incubator/harmony/enhanced/classlib/trunk/modules/swing: build.xml make/patternset.txt

Author: hindessm
Date: Fri Oct  6 12:21:41 2006
New Revision: 453732

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

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

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