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 16:13:38 UTC
svn commit: r453605 - in
/incubator/harmony/enhanced/classlib/trunk/modules/security: build.xml
make/patternset.txt
Author: hindessm
Date: Fri Oct 6 07:13:37 2006
New Revision: 453605
URL: http://svn.apache.org/viewvc?view=rev&rev=453605
Log:
Removing patternset
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/security/make/patternset.txt
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=453605&r1=453604&r2=453605
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Fri Oct 6 07:13:37 2006
@@ -26,19 +26,30 @@
<!-- set global properties for this build. -->
<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
- <fileset id="classes" dir="${hy.build}">
- <includesfile name="${hy.security}/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.security.src.main.java.platform"
value="${hy.security.src.main.java}/../${hy.os}" />
<property name="hy.security.src.test.java.platform"
value="${hy.security.src.test.java}/../${hy.os}" />
+
+ <fileset id="classes" dir="${hy.build}">
+ <or>
+ <present targetdir="${hy.security.src.main.java}" />
+ <present targetdir="${hy.security.src.main.java}">
+ <mapper type="regexp"
+ from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
+ to="\1.java"/>
+ </present>
+ <present targetdir="${hy.security.src.main.java.platform}" />
+ <present targetdir="${hy.security.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" />