harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939352 - in /harmony/enhanced/java/branches/mrh: ./ classlib/make/ common_resources/make/ drlvm/make/ drlvm/vm/gc_gen/resource/ drlvm/vm/vmcore/src/kernel_classes/resource/
Date Thu, 29 Apr 2010 15:44:47 GMT
Author: hindessm
Date: Thu Apr 29 15:44:46 2010
New Revision: 939352

URL: http://svn.apache.org/viewvc?rev=939352&view=rev
Log:
Change manifest to have specification version from property rather than
always being 1.5.
Change implementation version in drlvm jars to be svn repository/revision.

Modified:
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
    harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/resource/MANIFEST.MF
    harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=939352&r1=939351&r2=939352&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Thu Apr 29 15:44:46 2010
@@ -148,7 +148,6 @@ Usage:
     <!-- ============================================================== -->
     <target name="bundle-hdk" 
         depends="assemble-artifacts,
-                 assemble-hdk-doc,
                  bundle-hdk-tgz,
                  bundle-hdk-zip" />
 
@@ -409,7 +408,8 @@ Usage:
         <propertyref name="is.federated.build" />
     </propertyset>
     
-    <target name="build-classlib" depends="-build-classlib,assemble-hdk-doc"/>
+    <target name="build-classlib"
+            depends="init,-build-classlib,assemble-hdk-doc"/>
     <target name="-build-classlib" depends="auto-fetch-classlib-libs">
         <ant antfile="classlib/build.xml" target="build" inheritAll="false" >
             <propertyset refid="required.props" />
@@ -476,7 +476,7 @@ Usage:
     <!-- ============================================================== -->
     <!-- ensures that dependencies are up to date and then builds a vm  -->
     <!-- ============================================================== -->
-    <target name="build-vm" depends="auto-fetch-vm-libs">
+    <target name="build-vm" depends="init,auto-fetch-vm-libs">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="build" inheritAll="false" >
             <propertyset refid="required.props" />
@@ -529,7 +529,8 @@ Usage:
     <!-- ============================================================== -->
     <!-- fetches the common resources                                   -->
     <!-- ============================================================== -->
-    <target name="build-commonresources" depends="auto-fetch-commonresources"/>
+    <target name="build-commonresources"
+            depends="init,auto-fetch-commonresources"/>
 
     <target name="auto-fetch-commonresources" if="auto.fetch">
         <ant target="fetch-commonresources">
@@ -560,7 +561,8 @@ Usage:
     <!-- ============================================================== -->
     <!-- ensures dependencies are up to date, then builds jdktools      -->
     <!-- ============================================================== -->
-    <target name="build-jdktools" depends="auto-fetch-jdktools-libs">
+    <target name="build-jdktools"
+            depends="init,auto-fetch-jdktools-libs">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=939352&r1=939351&r2=939352&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Thu Apr 29 15:44:46 2010
@@ -716,6 +716,12 @@ Alternatively, you can switch to another
                 <attribute name="Implementation-URL"
                            value="http://harmony.apache.org"/>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
+                <attribute name="Specification-Vendor"
+                           value="Sun Microsystems, Inc." />
+                <attribute name="Specification-Title"
+                           value="Java Platform API Specification" />
+                <attribute name="Specification-Version"
+                           value="${hy.specification.version}" />
             </manifest>
             <metainf refid="hy.required.metainf-files"/>
         </jar>

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml?rev=939352&r1=939351&r2=939352&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml Thu Apr 29 15:44:46
2010
@@ -381,6 +381,12 @@ Alternatively, you can switch to another
                 <attribute name="Implementation-URL"
                            value="http://harmony.apache.org"/>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
+                <attribute name="Specification-Vendor"
+                           value="Sun Microsystems, Inc." />
+                <attribute name="Specification-Title"
+                           value="Java Platform API Specification" />
+                <attribute name="Specification-Version"
+                           value="${hy.specification.version}" />
                 <attribute name="X-Compile-Source-JDK"
                            value="${hy.javac.source}"/> 
                 <attribute name="X-Compile-Target-JDK"

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml?rev=939352&r1=939351&r2=939352&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/properties.xml Thu Apr 29 15:44:46 2010
@@ -31,6 +31,7 @@
     <condition property="hy.cfg" value="${env.BUILD_CFG}">
         <isset property="env.BUILD_CFG" />
     </condition>
+    <property name="hy.specification.version" value="1.5" />
 
     <!-- pick up cpp compiler from command line or env -->
     <condition property="hy.cpp.compiler" value="${CXX}">

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/resource/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/resource/MANIFEST.MF?rev=939352&r1=939351&r2=939352&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/resource/MANIFEST.MF (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/resource/MANIFEST.MF Thu Apr 29 15:44:46
2010
@@ -3,4 +3,3 @@ Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
 Implementation-URL: http://harmony.apache.org
-Implementation-Version: 1.5

Modified: harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF?rev=939352&r1=939351&r2=939352&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF
(original)
+++ harmony/enhanced/java/branches/mrh/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF
Thu Apr 29 15:44:46 2010
@@ -1,8 +1,6 @@
 Manifest-Version: 1.0
 Specification-Title: Java Platform API Specification
-Specification-Version: 1.5
 Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
 Implementation-URL: http://harmony.apache.org
-Implementation-Version: 1.5



Mime
View raw message