harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r430827 [1/2] - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/crypto/ modules/instrument/ modules/jndi/ mod...
Date Fri, 11 Aug 2006 17:00:17 GMT
Author: tellison
Date: Fri Aug 11 10:00:15 2006
New Revision: 430827

URL: http://svn.apache.org/viewvc?rev=430827&view=rev
Log:
Move svn.info up into a 'global' build property, and use it to mark each built jar version.

Modified:
    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/crypto/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/logging/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/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/regex/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/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/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Fri Aug 11 10:00:15 2006
@@ -113,7 +113,7 @@
     </condition>
     <property name="make.command" value="make" />
 
-    <target name="echo" depends="svn-prop" >
+    <target name="echo" depends="svn-prop, svn-info" >
         <echo>
 
 Harmony module implementation properties:
@@ -156,6 +156,11 @@
   svn.revision = ${svn.revision}
 
 
+The following property is only set if the "svn-info" target has been
+called:
+
+  svn.info = ${svn.info}
+
 Ant native properties, for information, but please use Harmony
 properties in preference to these:
 
@@ -180,6 +185,32 @@
                 </outputfilterchain>
             </redirector>
         </exec>
+    </target>
+
+    <target name="svn-info">
+        <exec executable="svn"
+              failifexecutionfails="false"
+              resultproperty="svn.rc">
+            <arg value="info" />
+            <redirector outputproperty="svn.info.tmp">
+                <outputfilterchain>
+                    <linecontainsregexp>
+                        <regexp pattern="Repository Root:|Revision:" />
+                    </linecontainsregexp>
+                    <tokenfilter>
+                        <replacestring from="Repository Root: " to=""/>
+                        <replacestring from="Revision: " to=" "/>
+                    </tokenfilter>
+                    <striplinebreaks/>
+                </outputfilterchain>
+            </redirector>
+        </exec>
+        <condition property="svn.info" value="${svn.info.tmp}" >
+            <equals arg1="${svn.rc}" arg2="0" />
+        </condition>
+        <tstamp>
+            <format property="svn.info" pattern="'Unknown revision at' dd-MMM-yyyy hh:mm aa"/>
+        </tstamp>
     </target>
 
     <macrodef name="call-modules">

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Fri Aug 11 10:00:15 2006
@@ -1,142 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2005, 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project name="ACCESSIBILITY Build" default="build" basedir=".">
-    <description>Build for ACCESSIBILITY component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.accessibility}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.accessibility.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java">
-        <echo message="Compiling ACCESSIBILITY classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.accessibility.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar"
-             manifest="${hy.accessibility}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests">
-        <echo message="Compiling ACCESSIBILITY tests" />
-
-        <mkdir dir="${hy.accessibility.bin.test}" />
-
-        <javac srcdir="${hy.accessibility.src.test.api}/java/common"
-               destdir="${hy.accessibility.bin.test}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-            <classpath location="${hy.hdk}/build/test/support.jar" /> 
-        </javac>
-    </target>
-
-    <target name="run.tests" if="with.awt.swing">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-               forkmode="once"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.accessibility.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.accessibility.src.test.api}/java/common"/>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true">accessibility${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">accessibility${line.separator}</echo>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005, 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="ACCESSIBILITY Build" default="build" basedir=".">
+    <description>Build for ACCESSIBILITY component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.accessibility}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.accessibility.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling ACCESSIBILITY classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.accessibility.src.main.java}"
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar"
+             manifest="${hy.accessibility}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests">
+        <echo message="Compiling ACCESSIBILITY tests" />
+
+        <mkdir dir="${hy.accessibility.bin.test}" />
+
+        <javac srcdir="${hy.accessibility.src.test.api}/java/common"
+               destdir="${hy.accessibility.bin.test}"
+               sourcepath=""
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+            <classpath location="${hy.hdk}/build/test/support.jar" /> 
+        </javac>
+    </target>
+
+    <target name="run.tests" if="with.awt.swing">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${hy.accessibility.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.accessibility.src.test.api}/java/common"/>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">accessibility${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">accessibility${line.separator}</echo>
+    </target>
+
+</project>

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Fri Aug 11 10:00:15 2006
@@ -66,10 +66,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar"
              manifest="${hy.annotation}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Fri Aug 11 10:00:15 2006
@@ -66,10 +66,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/applet.jar"
              manifest="${hy.applet}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Fri Aug 11 10:00:15 2006
@@ -126,10 +126,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/archive.jar"
              manifest="${hy.archive}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Fri Aug 11 10:00:15 2006
@@ -96,10 +96,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
              manifest="${hy.auth}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Fri Aug 11 10:00:15 2006
@@ -76,10 +76,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/awt.jar"
              manifest="${hy.awt}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Fri Aug 11 10:00:15 2006
@@ -68,10 +68,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/beans.jar"
              manifest="${hy.beans}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Fri Aug 11 10:00:15 2006
@@ -68,10 +68,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
              manifest="${hy.crypto}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/instrument/build.xml Fri Aug 11 10:00:15 2006
@@ -95,10 +95,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
              manifest="${hy.instrument}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Fri Aug 11 10:00:15 2006
@@ -1,188 +1,191 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project name="JNDI Build" default="build" basedir=".">
-    <description>Build for JNDI component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.jndi}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.jndi.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java">
-        <echo message="Compiling JNDI classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.jndi.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
-             manifest="${hy.jndi}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests" depends="copy.test.resources" >
-        <echo message="Compiling JNDI tests" />
-
-        <mkdir dir="${hy.jndi.bin.test}" />
-
-        <javac srcdir="${hy.jndi.src.test.java}"
-            destdir="${hy.jndi.bin.test}"
-            sourcepath=""
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-               forkmode="perBatch"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.jndi.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.jndi.bin.test}"/>
-            </classpath>
-            <classpath location="../../build/tests" />
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-        	
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.jndi.src.test.java}">
-                    <include name="**/*Test.java"/>
-                	<!--  These tests run in a separate jvm below -->
-                	<exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
-                    <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
-                	<exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
-                </fileset>
-            </batchtest>
-        	
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-        	       unless="test.case">
-        	
-        	<fileset dir="${hy.jndi.src.test.java}">
-        	    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
-        	</fileset>
-            </batchtest>
-        	
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-        	       unless="test.case">
-        	
-        	<fileset dir="${hy.jndi.src.test.java}">
-        	    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
-        	</fileset>
-            </batchtest>        	
-        	
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-        	       unless="test.case">
-        	
-        	<fileset dir="${hy.jndi.src.test.java}">
-        	    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
-        	</fileset>
-            </batchtest>        	
-            
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true">jndi${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">jndi${line.separator}</echo>
-    </target>
-
-    <target name="copy.test.resources">
-        <mkdir dir="${hy.jndi.bin.test}" />
-        <copy todir="${hy.jndi.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.jndi.src.test.resources}">
-                <exclude name="**/*.java" />
-                <exclude name="**/*.zip" />
-            </fileset>
-        </copy>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="JNDI Build" default="build" basedir=".">
+    <description>Build for JNDI component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.jndi}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.jndi.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling JNDI classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.jndi.src.main.java}"
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
+             manifest="${hy.jndi}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests" depends="copy.test.resources" >
+        <echo message="Compiling JNDI tests" />
+
+        <mkdir dir="${hy.jndi.bin.test}" />
+
+        <javac srcdir="${hy.jndi.src.test.java}"
+            destdir="${hy.jndi.bin.test}"
+            sourcepath=""
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+        </javac>
+    </target>
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="perBatch"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${hy.jndi.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.jndi.bin.test}"/>
+            </classpath>
+            <classpath location="../../build/tests" />
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+        	
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.jndi.src.test.java}">
+                    <include name="**/*Test.java"/>
+                	<!--  These tests run in a separate jvm below -->
+                	<exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
+                    <exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
+                	<exclude name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
+                </fileset>
+            </batchtest>
+        	
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+        	       unless="test.case">
+        	
+        	<fileset dir="${hy.jndi.src.test.java}">
+        	    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
+        	</fileset>
+            </batchtest>
+        	
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+        	       unless="test.case">
+        	
+        	<fileset dir="${hy.jndi.src.test.java}">
+        	    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
+        	</fileset>
+            </batchtest>        	
+        	
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+        	       unless="test.case">
+        	
+        	<fileset dir="${hy.jndi.src.test.java}">
+        	    <include name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
+        	</fileset>
+            </batchtest>        	
+            
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">jndi${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">jndi${line.separator}</echo>
+    </target>
+
+    <target name="copy.test.resources">
+        <mkdir dir="${hy.jndi.bin.test}" />
+        <copy todir="${hy.jndi.bin.test}" includeemptydirs="false">
+            <fileset dir="${hy.jndi.src.test.resources}">
+                <exclude name="**/*.java" />
+                <exclude name="**/*.zip" />
+            </fileset>
+        </copy>
+    </target>
+
+</project>

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Fri Aug 11 10:00:15 2006
@@ -66,10 +66,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
              manifest="${hy.logging}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Fri Aug 11 10:00:15 2006
@@ -21,6 +21,9 @@
 
     <description>Build for luni kernel stub jar</description>
 
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
     <property name="hy.jdk" location="../../deploy/jdk" />
     <property name="hy.build" location="../../build/classes" />
     <property name="stub.jar"
@@ -35,9 +38,12 @@
         </fail>
     </target>
 
-    <target name="build">
+    <target name="build" depends="svn-info">
         <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}" includesfile="make/patternset.txt" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Fri Aug 11 10:00:15 2006
@@ -267,33 +267,7 @@
         </javac>
     </target>
 
-    <target name="-svn-prop">
-        <exec executable="svn"
-              failifexecutionfails="false"
-              resultproperty="svn.rc">
-            <arg value="info" />
-            <redirector outputproperty="svn.info.tmp">
-                <outputfilterchain>
-                    <linecontainsregexp>
-                        <regexp pattern="Repository Root:|Revision:" />
-                    </linecontainsregexp>
-                    <tokenfilter>
-                        <replacestring from="Repository Root: " to=""/>
-                        <replacestring from="Revision: " to=" "/>
-                    </tokenfilter>
-                    <striplinebreaks/>
-                </outputfilterchain>
-            </redirector>
-        </exec>
-        <condition property="svn.info" value="${svn.info.tmp}" >
-            <equals arg1="${svn.rc}" arg2="0" />
-        </condition>
-        <tstamp>
-            <format property="svn.info" pattern="'Unknown revision built at' dd-MMM-yyyy hh:mm aa"/>
-        </tstamp>
-    </target>
-
-    <target name="build.jar" depends="-svn-prop">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
              manifest="${hy.luni}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Fri Aug 11 10:00:15 2006
@@ -66,10 +66,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/math.jar"
              manifest="${hy.math}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Fri Aug 11 10:00:15 2006
@@ -1,162 +1,165 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2005, 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project name="MISC Build" default="build" basedir=".">
-    <description>Build for MISC component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.misc}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.misc.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java">
-        <echo message="Compiling MISC classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.misc.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}.jar"
-             manifest="${hy.misc}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="build.native" >
-    	<make dir="${hy.misc.src.main.native}/accessors/${hy.os}" />
-
-	<!-- Copy the built shared libs over to the jre/bin dir -->
-	<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-	    <fileset dir="${hy.misc.src.main.native}/accessors">
-                <patternset includes="*${shlib.suffix}*" />
-            </fileset>
-        </copy>
-    </target>
-	
-    <!-- Clean natives -->
-    <target name="clean.native">
-    	<make dir="${hy.misc.src.main.native}/accessors/${hy.os}"
-              target="clean" />
-    </target>
-
-    <target name="compile.tests">
-        <echo message="Compiling MISC tests" />
-
-        <mkdir dir="${hy.misc.bin.test}" />
-
-        <javac srcdir="${hy.misc.src.test.java}"
-               destdir="${hy.misc.bin.test}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-               forkmode="once"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.misc.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.misc.bin.test}"/>
-            </classpath>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.misc.src.test.java}"/>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true">misc${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">misc${line.separator}</echo>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005, 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="MISC Build" default="build" basedir=".">
+    <description>Build for MISC component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.misc}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.misc.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling MISC classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.misc.src.main.java}"
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}.jar"
+             manifest="${hy.misc}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="build.native" >
+    	<make dir="${hy.misc.src.main.native}/accessors/${hy.os}" />
+
+	<!-- Copy the built shared libs over to the jre/bin dir -->
+	<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+	    <fileset dir="${hy.misc.src.main.native}/accessors">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+	
+    <!-- Clean natives -->
+    <target name="clean.native">
+    	<make dir="${hy.misc.src.main.native}/accessors/${hy.os}"
+              target="clean" />
+    </target>
+
+    <target name="compile.tests">
+        <echo message="Compiling MISC tests" />
+
+        <mkdir dir="${hy.misc.bin.test}" />
+
+        <javac srcdir="${hy.misc.src.test.java}"
+               destdir="${hy.misc.bin.test}"
+               sourcepath=""
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+        </javac>
+    </target>
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${hy.misc.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.misc.bin.test}"/>
+            </classpath>
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.misc.src.test.java}"/>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">misc${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">misc${line.separator}</echo>
+    </target>
+
+</project>

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Fri Aug 11 10:00:15 2006
@@ -88,11 +88,14 @@
 		</javac>
 	</target>
 
-	<target name="build.jar">
+	<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>
 		</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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Fri Aug 11 10:00:15 2006
@@ -66,10 +66,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
              manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Fri Aug 11 10:00:15 2006
@@ -1,180 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project name="PREFS Build" default="build" basedir=".">
-    <description>Build for PREFS component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.prefs}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <!-- Build natives. Currently there are only windows natives for
-	 prefs, so we check if we are on a windows platform -->
-    <target name="build.native" if="is.windows">
-	<make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" />
-
-	<!-- Copy the built shared libs over to the jre/bin dir -->
-	<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.prefs.src.main.native}/prefs">
-                <patternset includes="*${shlib.suffix}*" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.prefs.bin.test}" />
-        </delete>
-    </target>
-
-    <!-- Clean natives. Currently there are only windows natives for
-	 prefs, so we check if we are on a windows platform -->
-    <target name="clean.native" if="is.windows">
-	<make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" target="clean" />
-    </target>
-
-
-    <target name="compile.java">
-        <echo message="Compiling PREFS classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.prefs.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
-             manifest="${hy.prefs}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests" depends="copy.test.resources">
-        <echo message="Compiling PREFS tests" />
-
-        <mkdir dir="${hy.prefs.bin.test}" />
-
-        <javac srcdir="${hy.prefs.src.test.java}"
-               destdir="${hy.prefs.bin.test}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-            forkmode="once"
-            printsummary="withOutAndErr"
-            errorproperty="test.errors"
-            failureproperty="test.failures"
-            showoutput="on"
-            dir="${hy.prefs.bin.test}"
-            jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.prefs.bin.test}"/>
-            </classpath>
-            <classpath location="../../build/tests" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.prefs.src.test.java}">
-                    <include name="**/*Test.java"/>
-                    <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true">prefs${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">prefs${line.separator}</echo>
-    </target>
-
-    <target name="copy.test.resources">
-        <mkdir dir="${hy.prefs.bin.test}" />
-        <copy todir="${hy.prefs.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.prefs.src.test.resources}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="PREFS Build" default="build" basedir=".">
+    <description>Build for PREFS component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.prefs}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <!-- Build natives. Currently there are only windows natives for
+	 prefs, so we check if we are on a windows platform -->
+    <target name="build.native" if="is.windows">
+	<make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" />
+
+	<!-- Copy the built shared libs over to the jre/bin dir -->
+	<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${hy.prefs.src.main.native}/prefs">
+                <patternset includes="*${shlib.suffix}*" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.prefs.bin.test}" />
+        </delete>
+    </target>
+
+    <!-- Clean natives. Currently there are only windows natives for
+	 prefs, so we check if we are on a windows platform -->
+    <target name="clean.native" if="is.windows">
+	<make dir="${hy.prefs.src.main.native}/prefs/${hy.os}" target="clean" />
+    </target>
+
+
+    <target name="compile.java">
+        <echo message="Compiling PREFS classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.prefs.src.main.java}"
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
+             manifest="${hy.prefs}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests" depends="copy.test.resources">
+        <echo message="Compiling PREFS tests" />
+
+        <mkdir dir="${hy.prefs.bin.test}" />
+
+        <javac srcdir="${hy.prefs.src.test.java}"
+               destdir="${hy.prefs.bin.test}"
+               sourcepath=""
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+        </javac>
+    </target>
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.prefs.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.prefs.bin.test}"/>
+            </classpath>
+            <classpath location="../../build/tests" />
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.prefs.src.test.java}">
+                    <include name="**/*Test.java"/>
+                    <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">prefs${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">prefs${line.separator}</echo>
+    </target>
+
+    <target name="copy.test.resources">
+        <mkdir dir="${hy.prefs.bin.test}" />
+        <copy todir="${hy.prefs.bin.test}" includeemptydirs="false">
+            <fileset dir="${hy.prefs.src.test.resources}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+</project>

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Fri Aug 11 10:00:15 2006
@@ -1,148 +1,151 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project name="REGEX Build" default="build" basedir=".">
-    <description>Build for REGEX component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.regex}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.regex.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java">
-        <echo message="Compiling REGEX classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.regex.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
-            manifest="${hy.regex}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests">
-        <echo message="Compiling REGEX tests" />
-
-        <mkdir dir="${hy.regex.bin.test}" />
-
-        <javac srcdir="${hy.regex.src.test.java}"
-               destdir="${hy.regex.bin.test}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-               forkmode="once"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.regex.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.regex.bin.test}"/>
-            </classpath>
-            <classpath location="../../build/tests" />
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.regex.src.test.java}">
-                    <include name="**/*Test.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true">regex${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">regex${line.separator}</echo>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="REGEX Build" default="build" basedir=".">
+    <description>Build for REGEX component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.regex}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.regex.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling REGEX classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.regex.src.main.java}"
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
+            manifest="${hy.regex}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests">
+        <echo message="Compiling REGEX tests" />
+
+        <mkdir dir="${hy.regex.bin.test}" />
+
+        <javac srcdir="${hy.regex.src.test.java}"
+               destdir="${hy.regex.bin.test}"
+               sourcepath=""
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../build/tests" />
+        </javac>
+    </target>
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${hy.regex.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.regex.bin.test}"/>
+            </classpath>
+            <classpath location="../../build/tests" />
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.regex.src.test.java}">
+                    <include name="**/*Test.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true">regex${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">regex${line.separator}</echo>
+    </target>
+
+</project>

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Fri Aug 11 10:00:15 2006
@@ -68,10 +68,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar"
              manifest="${hy.rmi}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml Fri Aug 11 10:00:15 2006
@@ -65,10 +65,13 @@
             </bootclasspath>
         </javac>
     </target>
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
              manifest="${hy.rmi}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
     <target name="compile.tests">

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Fri Aug 11 10:00:15 2006
@@ -21,6 +21,9 @@
 
     <description>Build for security kernel stub jar</description>
 
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
     <property name="hy.jdk" location="../../deploy/jdk" />
     <property name="hy.build" location="../../build/classes" />
     <property name="stub.jar"
@@ -35,9 +38,12 @@
         </fail>
     </target>
 
-    <target name="build">
+    <target name="build" depends="svn-info">
         <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}" includesfile="make/patternset.txt" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Fri Aug 11 10:00:15 2006
@@ -101,10 +101,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
              manifest="${hy.security}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </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?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sound/build.xml Fri Aug 11 10:00:15 2006
@@ -66,10 +66,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}.jar"
              manifest="${hy.sound}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 



Mime
View raw message