harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r370849 - /incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Date Fri, 20 Jan 2006 15:37:18 GMT
Author: geirm
Date: Fri Jan 20 07:37:16 2006
New Revision: 370849

URL: http://svn.apache.org/viewcvs?rev=370849&view=rev
Log:
merging security2 into the full build

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=370849&r1=370848&r2=370849&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Fri Jan 20 07:37:16 2006
@@ -159,7 +159,10 @@
             <src path="luni/src/main/java" />
             <src path="nio/src/main/java" />
             <src path="nio_char/src/main/java" />
-            <src path="security/src/main/java" />
+<!--  gmj : HACK :            <src path="security/src/main/java" /> -->
+            <src path="security2/src/common/javasrc" />
+            <src path="security2/src/windows/javasrc" />
+        	
             <src path="text/src/main/java" />
             <classpath location="${build.output}" />
             <classpath>
@@ -190,9 +193,20 @@
             <fileset dir="nio_char/src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
+<!--  gmj : HACK :            
             <fileset dir="security/src/main/java">
                 <exclude name="**/*.java" />
-            </fileset>
+            </fileset> 
+-->
+        	
+            <fileset dir="security/src">
+                <exclude name="**/*.java" />
+            </fileset> 
+
+            <fileset dir="security/src">
+                <exclude name="**/*.java" />
+            </fileset> 
+
             <fileset dir="text/src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -242,12 +256,23 @@
             </fileset>
         </copy>
 
+<!--  gmj : HACK : - use from security2
+
         <copy todir="${target.output}/jre/lib/security" overwrite="yes">
             <fileset dir="${depends.files}">
                 <include name="java.policy" />
                 <include name="java.security" />
             </fileset>
         </copy>
+ -->
+    	
+        <copy todir="${target.output}/jre/lib/security" overwrite="yes">
+            <fileset dir="../modules/security2/src/java.home/lib/security/">
+                <include name="drl.policy" />
+                <include name="java.security" />
+            </fileset>
+        </copy>
+    	
     </target>
 
 



Mime
View raw message