harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r466132 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio/ module...
Date Fri, 20 Oct 2006 14:47:37 GMT
Author: tellison
Date: Fri Oct 20 07:47:35 2006
New Revision: 466132

URL: http://svn.apache.org/viewvc?view=rev&rev=466132
Log:
Update build scripts to create <module>-src.jar files.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/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=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Fri Oct 20 07:47:35 2006
@@ -47,7 +47,7 @@
     <!-- ================================= 
           target: build
          ================================= -->
-    <target name="build" depends="-compile, -layout"
+    <target name="build" depends="-layout, -compile"
             description="Compile Java source and construct deploy directory." />
 
     <!-- ================================= 
@@ -56,7 +56,6 @@
     <target name="clean" depends="-clean-bin, -clean-layout"
         description="Remove compiled classes and delete the deploy directory."/>
 
-
     <!-- ================================= 
           target: -clean-bin
           Delete all built classes
@@ -188,10 +187,7 @@
             </classpath>
         </javac>
 
-        <mkdir dir="${hy.jdk}/jre/lib/boot" />
-
         <call-modules target="build" />
-
     </target>
 
 
@@ -199,17 +195,20 @@
           target: -layout              
           Construct the correct directory structure for the class libs
          ================================= -->
-    <target name="-layout" depends="-compile">
-        
+    <target name="-layout" depends="-prepare-depends">
+
         <!-- Create the structure -->
         <mkdir dir="${hy.jdk}/jre/bin" />
         <mkdir dir="${hy.jdk}/jre/lib/boot" />
         <mkdir dir="${hy.jdk}/jre/lib/ext" />
         <mkdir dir="${hy.jdk}/jre/lib/security" />
 
+        <!-- Copy across the required files -->
+        <copy file="LICENSE" todir="${hy.hdk}" verbose="yes" />
+        <copy file="NOTICE" todir="${hy.hdk}" verbose="yes" />
+
         <!-- Copy across the boot dependency jars -->
-        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes"
-              verbose="yes">
+        <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
                 <patternset includes="*.jar" />
                 <patternset includes="xerces_2.8.0/*.jar" />
@@ -223,19 +222,17 @@
         </copy>
 
         <!-- Copy across the extension dependency jars -->
-        <copy todir="${hy.jdk}/jre/lib/ext" overwrite="yes"
-              verbose="yes" flatten="yes">
+        <copy todir="${hy.jdk}/jre/lib/ext" flatten="yes">
             <fileset file="${bcprov.jar}" />
         </copy>
 
         <!-- Copy across the jdk/lib dependency jars -->
-        <copy todir="${hy.jdk}/lib" overwrite="yes"
-              verbose="yes" flatten="yes">
+        <copy todir="${hy.jdk}/lib" flatten="yes">
             <fileset file="${ecj.jar}" />
         </copy>
 
         <!-- Copy across the support files -->
-        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.files}">
                 <include name="bootclasspath.properties" />
             </fileset>
@@ -243,13 +240,12 @@
         <fixcrlf srcdir="${hy.jdk}/jre/lib/boot"
             includes="bootclasspath.properties" />
 
-        <copy todir="${hy.jdk}/jre/lib/security" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/lib/security">
              <fileset dir="${depends.files}">
                  <include name="java.policy" />
                  <include name="java.security" />
              </fileset>
          </copy>
-
     </target>
 
 
@@ -262,6 +258,10 @@
                 <exclude name="jre/bin/default/**" />
                 <exclude name="jre/bin/**" />
                 <exclude name="jre/lib/ext/**" />
+            </fileset>
+            <fileset dir="${hy.hdk}">
+                <include name="LICENSE" />
+                <include name="NOTICE" />
             </fileset>
         </delete>
     </target>

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Fri Oct 20 07:47:35 2006
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -273,5 +275,4 @@
             </exec>
         </sequential>
     </macrodef>
-    
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Fri Oct 20 07:47:35 2006
@@ -46,6 +46,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}-src.jar" />
         <delete file="${hy.jdk}/build/test/${hy.accessibility.packaging.jarname}_tests.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
@@ -93,10 +94,22 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>            
+            <!-- metainf refid="${hy.required.metafiles}"/ -->
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>    
+        </jar>
 
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}-src.jar"
+             manifest="${hy.accessibility}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.accessibility.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>            
         </jar>
+
     </target>
 
     <target name="test-jar" depends="svn-info">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.annotation.bin.test}" />
@@ -88,9 +89,19 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>            
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
 
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}-src.jar"
+             manifest="${hy.annotation}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.annotation.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/applet.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.applet.bin.test}" />
@@ -87,9 +88,21 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>            
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>            
         </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/applet-src.jar"
+             manifest="${hy.applet}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.applet.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>            
+        </jar>
+
     </target>
 
     <target name="compile-tests">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Fri Oct 20 07:47:35 2006
@@ -41,25 +41,25 @@
     <target name="build" depends="compile-java, copy-resources, build-jar" />
     
     <target name="copy-native-includes" depends="overlay-oss">
-    <copy todir="${hy.hdk}/include" overwrite="yes">
-        <fileset dir="${hy.archive.src.main.native}/include/shared">
-        <include name="zipsup.h" />
-        </fileset>
-        <fileset dir="${hy.archive.src.main.native}/zlib_dist">
-        <include name="zlib.h" />
-        <include name="zconf.h" />
-        </fileset>
-    </copy>
+        <copy todir="${hy.hdk}/include" overwrite="yes">
+            <fileset dir="${hy.archive.src.main.native}/include/shared">
+                <include name="zipsup.h" />
+            </fileset>
+            <fileset dir="${hy.archive.src.main.native}/zlib_dist">
+                <include name="zlib.h" />
+                <include name="zconf.h" />
+            </fileset>
+        </copy>
     </target>
     
     <target name="overlay-oss">
-    <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
-    <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
-    <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
+        <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
+        <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
+        <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
     </target>
     
     <target name="clean-overlay-oss">
-    <delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
+        <delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
     </target>
     
     <!-- Build native code -->
@@ -94,6 +94,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.archive.bin.test}" />
@@ -147,8 +148,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/archive-src.jar"
+             manifest="${hy.archive}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.archive.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Fri Oct 20 07:47:35 2006
@@ -74,6 +74,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.auth.bin.test}" />
@@ -123,8 +124,20 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}-src.jar"
+             manifest="${hy.auth}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.auth.src.main.java}" />
+            <fileset dir="${hy.auth.src.main.java.platform}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Fri Oct 20 07:47:35 2006
@@ -56,6 +56,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
+	<delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.awt.bin.test}" />
@@ -104,8 +105,21 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/awt-src.jar"
+             manifest="${hy.awt}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.awt.src.main.java}" />
+            <fileset dir="${hy.awt.src.main.java.platform}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Fri Oct 20 07:47:35 2006
@@ -44,6 +44,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/beans.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.beans.bin.test}" />
@@ -88,8 +89,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/beans-src.jar"
+             manifest="${hy.beans}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.beans.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Fri Oct 20 07:47:35 2006
@@ -48,6 +48,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.concurrent.bin.test}" />
@@ -83,8 +84,21 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}-src.jar"
+             manifest="${hy.concurrent}/META-INF/MANIFEST.MF">
+            <fileset dir="src/main/java" />
+            <fileset dir="standard/src/main/java" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Fri Oct 20 07:47:35 2006
@@ -44,6 +44,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.crypto.bin.test}" />
@@ -88,8 +89,18 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}-src.jar"
+             manifest="${hy.crypto}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.crypto.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/imageio/build.xml Fri Oct 20 07:47:35 2006
@@ -41,6 +41,8 @@
     <target name="test" depends="build, compile-tests, run-tests" />
 
     <target name="clean">
+        <delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
+	<delete file="${hy.jdk}/jre/lib/boot/imageio-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.imageio.bin.test}" />
@@ -79,8 +81,6 @@
         </copy>
     </target>
 
-
-
     <target name="copy-resources">
         <mkdir dir="${hy.build}" />
         <copy todir="${hy.build}" includeemptydirs="false">
@@ -97,8 +97,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/imageio-src.jar"
+             manifest="${hy.imageio}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.imageio.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Fri Oct 20 07:47:35 2006
@@ -43,22 +43,22 @@
     <target name="test" depends="build, compile-tests, run-tests" />
     
     <target name="overlay-oss">
-    <mkdir dir="${hy.instrument.src.main.native}/icu4c/unicode" />
-    <unzip src="${iculib.zip}" dest="${hy.instrument.src.main.native}/icu4c/unicode" />
-    <chmod dir="${hy.instrument.src.main.native}/icu4c/unicode" perm="ugo+r" />
+        <mkdir dir="${hy.instrument.src.main.native}/icu4c/unicode" />
+        <unzip src="${iculib.zip}" dest="${hy.instrument.src.main.native}/icu4c/unicode" />
+        <chmod dir="${hy.instrument.src.main.native}/icu4c/unicode" perm="ugo+r" />
     </target>
     
     <target name="clean-overlay-oss">
-    <delete dir="${hy.instrument.src.main.native}/icu4c" quiet="true" />
+        <delete dir="${hy.instrument.src.main.native}/icu4c" quiet="true" />
     </target>
     
     <!-- Build native code -->
     <target name="build-native" >
-    <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" />
+        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" />
 
-    <!-- Copy the built shared libs over to the jre/bin dir -->
-    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.instrument.src.main.native}/instrument">
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.instrument.src.main.native}/instrument">
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
@@ -66,11 +66,12 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-    <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" target="clean" />
+        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os}" target="clean" />
     </target>
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/instrument.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/instrument-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.instrument.bin.test}" />
@@ -115,8 +116,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/instrument-src.jar"
+             manifest="${hy.instrument}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.instrument.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/jndi.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/jndi-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.jndi.bin.test}" />
@@ -86,8 +87,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/jndi-src.jar"
+             manifest="${hy.jndi}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.jndi.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.lang-management.bin.test}" />
@@ -77,8 +78,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}-src.jar"
+             manifest="${hy.lang-management}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.lang-management.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.logging.bin.test}" />
@@ -77,8 +78,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/logging-src.jar"
+             manifest="${hy.logging}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.logging.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 
@@ -199,7 +212,7 @@
     </target>
 
     <target name="copy-resources">
-        <copy todir="${hy.jdk}/jre/lib" overwrite="yes" flatten="yes">
+        <copy todir="${hy.jdk}/jre/lib" flatten="yes">
             <fileset dir="${hy.logging.src.main.java}">
                 <include name="**/logging.properties" />
             </fileset>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Fri Oct 20 07:47:35 2006
@@ -165,6 +165,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.luni.bin.test}" />
@@ -225,8 +226,19 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/>
             </manifest>
             
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>            
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>            
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/luni-src.jar"
+             manifest="${hy.luni}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.luni.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/>
+            </manifest>
+            
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>            
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/math.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.math.bin.test}" />
@@ -86,8 +87,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/math-src.jar"
+             manifest="${hy.math}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.math.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.misc.bin.test}" />
@@ -86,8 +87,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}-src.jar"
+             manifest="${hy.misc}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.misc.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Fri Oct 20 07:47:35 2006
@@ -63,6 +63,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.nio.bin.test}" />
@@ -84,11 +85,11 @@
         <javac sourcepath=""
             srcdir="${hy.nio.src.main.java}"
             destdir="${hy.build}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
+            compiler="${hy.javac.compiler}"
+            memoryMaximumSize="${hy.javac.maxmem}"
+            source="${hy.javac.source}" 
+            target="${hy.javac.target}"
+            debug="${hy.javac.debug}">
 
             <bootclasspath>
                 <fileset dir="${hy.jdk}/jre/lib/boot">
@@ -110,13 +111,24 @@
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
             manifest="${hy.nio}/META-INF/MANIFEST.MF">
-
             <fileset refid="classes" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/nio-src.jar"
+            manifest="${hy.nio}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.nio.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Fri Oct 20 07:47:35 2006
@@ -44,6 +44,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.nio_char.bin.test}" />
@@ -88,8 +89,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}-src.jar"
+             manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.nio_char.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Fri Oct 20 07:47:35 2006
@@ -57,6 +57,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.prefs.bin.test}" />
@@ -108,8 +109,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/prefs-src.jar"
+             manifest="${hy.prefs}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.prefs.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/build.xml Fri Oct 20 07:47:35 2006
@@ -50,6 +50,8 @@
     <target name="test" depends="build, compile-tests, run-tests" />
 
     <target name="clean">
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.print.bin.test}" />
@@ -57,7 +59,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling Print classes" />
+        <echo message="Compiling PRINT classes" />
 
         <mkdir dir="${hy.build}" />
 
@@ -88,8 +90,6 @@
         </copy>
     </target>
 
-
-
     <target name="copy-resources">
         <mkdir dir="${hy.build}" />
         <copy todir="${hy.build}" includeemptydirs="false">
@@ -102,18 +102,39 @@
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/print.jar"
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}.jar"
              manifest="${hy.print}/META-INF/MANIFEST.MF">
-            <metainf prefix="META-INF/services" dir="${hy.print.src.main.java}/org/apache/harmony/x/print"
+            <metainf prefix="META-INF/services"
+                dir="${hy.print.src.main.java}/org/apache/harmony/x/print"
                 includes="javax.print.StreamPrintServiceFactory"/>
-            <metainf prefix="META-INF/services" dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
+            <metainf prefix="META-INF/services"
+                dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
                 includes="javax.print.PrintServiceLookup"/>
             <fileset refid="classes" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}-src.jar"
+             manifest="${hy.print}/META-INF/MANIFEST.MF">
+            <metainf prefix="META-INF/services"
+                dir="${hy.print.src.main.java}/org/apache/harmony/x/print"
+                includes="javax.print.StreamPrintServiceFactory"/>
+            <metainf prefix="META-INF/services"
+                dir="${hy.print.src.main.java.platform}/org/apache/harmony/x/print"
+                includes="javax.print.PrintServiceLookup"/>
+            <fileset dir="${hy.print.src.main.java}" />
+            <fileset dir="${hy.print.src.main.java.platform}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml Fri Oct 20 07:47:35 2006
@@ -34,6 +34,7 @@
         <test location="bin/test" />
       </bin>
       <packaging>
+        <jarname>print</jarname>
       </packaging>
    </print>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Fri Oct 20 07:47:35 2006
@@ -44,6 +44,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/regex-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.regex.bin.test}" />
@@ -88,8 +89,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/regex-src.jar"
+            manifest="${hy.regex}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.regex.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Fri Oct 20 07:47:35 2006
@@ -44,6 +44,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.rmi.bin.test}" />
@@ -88,10 +89,21 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
-    </target>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar"
+             manifest="${hy.rmi}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.rmi.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>    </target>
 
     <target name="compile-tests">
 

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=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Fri Oct 20 07:47:35 2006
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -68,7 +67,7 @@
 
 
     <target name="build-native" if="native.present" >
-    <make dir="${hy.security.src.main.native}/security/${hy.os}" />
+        <make dir="${hy.security.src.main.native}/security/${hy.os}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
@@ -88,6 +87,7 @@
     <property name="tests.resources.dir" value="${tests.hdk.dir}/resources/${hy.security.packaging.jarname}" />
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}-src.jar" />
         <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api.jar" />
         <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar" />
         <delete file="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl.jar" />
@@ -142,8 +142,21 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}-src.jar"
+             manifest="${hy.security}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.security.src.main.java}" />
+            <fileset dir="${hy.security.src.main.java.platform}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.sound.bin.test}" />
@@ -86,8 +87,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}-src.jar"
+             manifest="${hy.sound}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.sound.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.sql.bin.test}" />
@@ -84,8 +85,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/sql-src.jar"
+             manifest="${hy.sql}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.sql.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/suncompat.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/suncompat-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.suncompat.bin.test}" />
@@ -84,8 +85,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/suncompat-src.jar"
+             manifest="${hy.suncompat}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.suncompat.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

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=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Fri Oct 20 07:47:35 2006
@@ -56,6 +56,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.swing.bin.test}" />
@@ -104,8 +105,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}-src.jar"
+             manifest="${hy.swing}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.swing.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Fri Oct 20 07:47:35 2006
@@ -43,27 +43,29 @@
     <target name="test" depends="build, compile-tests, run-tests" />
     
     <target name="overlay-oss">
-    <mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
-    <unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
-    <chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
-    <antcall target="copy-libs" inheritall="true" />
+        <mkdir dir="${hy.text.src.main.native}/icu4c/unicode" />
+        <unzip src="${iculib.zip}" dest="${hy.text.src.main.native}/icu4c/unicode" />
+        <chmod dir="${hy.text.src.main.native}/icu4c/unicode" perm="ugo+r" />
+        <antcall target="copy-libs" inheritall="true" />
     </target>
+
     <target name="copy-libs" if="is.x86_64">
         <copy todir="${hy.text.src.main.native}/icu4c/unicode" overwrite="yes">
                 <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
         </copy>
     </target>
+
     <target name="clean-overlay-oss">
-    <delete dir="${hy.text.src.main.native}/icu4c" quiet="true" />
+        <delete dir="${hy.text.src.main.native}/icu4c" quiet="true" />
     </target>
     
     <!-- Build native code -->
     <target name="build-native" >
-    <make dir="${hy.text.src.main.native}/text/${hy.os}" />
+        <make dir="${hy.text.src.main.native}/text/${hy.os}" />
 
-    <!-- Copy the built shared libs over to the jre/bin dir -->
-    <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-        <fileset dir="${hy.text.src.main.native}/text">
+        <!-- Copy the built shared libs over to the jre/bin dir -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.text.src.main.native}/text">
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
@@ -71,11 +73,12 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-    <make dir="${hy.text.src.main.native}/text/${hy.os}" target="clean" />
+        <make dir="${hy.text.src.main.native}/text/${hy.os}" target="clean" />
     </target>
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/text.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/text-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.text.bin.test}" />
@@ -120,8 +123,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/text-src.jar"
+             manifest="${hy.text}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.text.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Fri Oct 20 07:47:35 2006
@@ -42,6 +42,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/lib/tools.jar" />
+        <delete file="${hy.jdk}/lib/tools-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.tools.bin.test}" />
@@ -92,8 +93,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/lib/tools-src.jar"
+             manifest="${hy.tools}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.tools.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=466132&r1=466131&r2=466132
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Fri Oct 20 07:47:35 2006
@@ -44,6 +44,7 @@
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.x-net.bin.test}" />
@@ -88,8 +89,20 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${basedir}/../../NOTICE"/>
-            <metainf file="${basedir}/../../LICENSE"/>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
+        </jar>
+
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}-src.jar"
+            manifest="${hy.x-net}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.x-net.src.main.java}" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+
+            <metainf file="${hy.hdk}/NOTICE"/>
+            <metainf file="${hy.hdk}/LICENSE"/>
         </jar>
     </target>
 



Mime
View raw message