harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r467953 - in /incubator/harmony/enhanced/classlib/trunk: make/build-java.xml modules/luni-kernel/build.xml modules/luni-kernel/make/patternset.txt modules/security-kernel/build.xml modules/security-kernel/make/patternset.txt
Date Thu, 26 Oct 2006 10:42:59 GMT
Author: hindessm
Date: Thu Oct 26 03:42:58 2006
New Revision: 467953

URL: http://svn.apache.org/viewvc?view=rev&rev=467953
Log:
Remove the last references to the patternset files.

Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/make/patternset.txt
    incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/make/patternset.txt
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=467953&r1=467952&r2=467953
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Oct 26 03:42:58 2006
@@ -61,9 +61,7 @@
           Delete all built classes
          ================================= -->
     <target name="-clean-bin"
-            depends="-copy-kernel-patternsets,
-                     -modules-clean-bin,
-                     -clean-kernel-patternsets,
+            depends="-modules-clean-bin,
                      -clean-bin-catch-all-test,
                      -clean-bin-catch-all"/>
 
@@ -107,23 +105,10 @@
         </fail>
     </target>
 
-    <target name="-copy-kernel-patternsets">
-        <mkdir dir="${hy.hdk}/build/patternsets" />
-        <copy file="modules/luni-kernel/make/patternset.txt"
-              tofile="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <copy file="modules/security-kernel/make/patternset.txt"
-              tofile="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </target>
-
-    <target name="-clean-kernel-patternsets">
-        <delete dir="${hy.hdk}/build/patternsets" />
-    </target>
-
     <!-- =================================
           target: -compile
          ================================= -->
-    <target name="-compile"
-            depends="-copy-kernel-patternsets,-prepare-depends">
+    <target name="-compile" depends="-prepare-depends">
         <fail message="The Eclipse compiler class for Ant could not be found. Please place
the ECJ JAR in ANT_HOME/lib. The JAR can copied from CLASSLIB_TRUNK/depends/jars/ecj_3.2 folder
after the fetch-depends target has been run.">
             <condition>
                 <not>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml?view=diff&rev=467953&r1=467952&r2=467953
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Thu Oct 26 03:42:58
2006
@@ -30,7 +30,14 @@
               location="${hy.jdk}/jre/lib/boot/luni-kernel-stubs.jar" />
 
     <fileset id="classes" dir="${hy.build}">
-        <includesfile name="make/patternset.txt" />
+        <or>
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
     </fileset>
 
     <target name="warn">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml?view=diff&rev=467953&r1=467952&r2=467953
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Thu Oct 26
03:42:58 2006
@@ -30,7 +30,14 @@
               location="${hy.jdk}/jre/lib/boot/security-kernel-stubs.jar" />
 
     <fileset id="classes" dir="${hy.build}">
-        <includesfile name="make/patternset.txt" />
+        <or>
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
+                <mapper type="regexp"
+                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+                        to="\1.java"/>
+            </present>
+        </or>
     </fileset>
 
     <target name="warn">



Mime
View raw message