harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r376349 - /incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Date Thu, 09 Feb 2006 16:57:08 GMT
Author: geirm
Date: Thu Feb  9 08:57:07 2006
New Revision: 376349

URL: http://svn.apache.org/viewcvs?rev=376349&view=rev
Log:
add x-net.  Note IDEA seems to have done some auto formatting...  I think 
that it's healthy


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=376349&r1=376348&r2=376349&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Feb  9 08:57:07 2006
@@ -122,39 +122,46 @@
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
 
+        <!-- Create x-net (javax.net from security2) jar -->
+        <jar destfile="${components.output}/x-net.jar" manifest="security/META-INF/MANIFEST.MF">
+            <fileset dir="${build.output}"
+                includesfile="${components.patternsets}/x-net.txt"
+                excludesfile="${components.patternsets}/kernel.txt" />
+        </jar>
+
         <!-- Create text jar -->
         <jar destfile="${components.output}/text.jar" manifest="text/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/text.txt" 
+            <fileset dir="${build.output}"
+                includesfile="${components.patternsets}/text.txt"
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
 
         <!-- Create math jar -->
         <jar destfile="${components.output}/math.jar" manifest="math/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/math.txt" 
+            <fileset dir="${build.output}"
+                includesfile="${components.patternsets}/math.txt"
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
 
         <!-- Create regex jar -->
         <jar destfile="${components.output}/regex.jar" manifest="regex/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/regex.txt" 
+            <fileset dir="${build.output}"
+                includesfile="${components.patternsets}/regex.txt"
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
-    	
+
         <!-- Create sql jar -->
         <jar destfile="${components.output}/sql.jar" manifest="sql/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/sql.txt" 
+            <fileset dir="${build.output}"
+                includesfile="${components.patternsets}/sql.txt"
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
 
     </target>
 
 
-    <!-- ================================= 
-          target: compile              
+    <!-- =================================
+          target: compile
          ================================= -->
     <target name="compile" depends="copy-resources" description="Compile the source">
         <mkdir dir="${build.output}" />
@@ -167,13 +174,14 @@
             <src path="luni/src/main/java" />
             <src path="nio/src/main/java" />
             <src path="nio_char/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="sql/src/main/java" />        	
+
+            <src path="x-net/src/main/java/" />
+
+            <src path="sql/src/main/java" />
             <src path="text/src/main/java" />
-        	
+
             <classpath location="${build.output}" />
             <classpath>
                 <fileset dir="${depends.jars}">
@@ -184,8 +192,8 @@
     </target>
 
 
-    <!-- ================================= 
-          target: copy-resources              
+    <!-- =================================
+          target: copy-resources
          ================================= -->
     <target name="copy-resources" description="Copy non-Java files under src tree to the
build output">
         <mkdir dir="${build.output}" />
@@ -203,19 +211,19 @@
             <fileset dir="nio_char/src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
-<!--  gmj : HACK :            
+<!--  gmj : HACK :
             <fileset dir="security/src/main/java">
                 <exclude name="**/*.java" />
-            </fileset> 
+            </fileset>
 -->
-        	
+
             <fileset dir="security/src">
                 <exclude name="**/*.java" />
-            </fileset> 
+            </fileset>
 
             <fileset dir="security/src">
                 <exclude name="**/*.java" />
-            </fileset> 
+            </fileset>
 
             <fileset dir="text/src/main/java">
                 <exclude name="**/*.java" />



Mime
View raw message