harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r810858 - in /harmony/enhanced: drlvm/trunk/make/vm/vmcore.xml drlvm/trunk/vm/vmcore/include/version_svn_tag_orig.h drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp trunk/build.xml
Date Thu, 03 Sep 2009 10:07:03 GMT
Author: hindessm
Date: Thu Sep  3 10:07:02 2009
New Revision: 810858

URL: http://svn.apache.org/viewvc?rev=810858&view=rev
Log:
Set java version system properties correctly if -Djava6=true property
is set on the ant build command line.

Modified:
    harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag_orig.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml?rev=810858&r1=810857&r2=810858&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/vmcore.xml Thu Sep  3 10:07:02 2009
@@ -245,10 +245,22 @@
 
     <target name="stamp-version" depends="-check-version,-copy-version"
         if="svn.revision" unless="skip.svn.stamp">
+        <condition property="harmony.java.runtime.version"
+                   value="1.6.0" else="1.5.0">
+            <equals arg1="${harmony.java.version}" arg2="6.0" />
+        </condition>
+        <condition property="harmony.java.specification.version"
+                   value="1.6" else="1.5">
+            <equals arg1="${harmony.java.version}" arg2="6.0" />
+        </condition>
         <copy file="${vm.home}/vmcore/include/version_svn_tag_orig.h"
               tofile="${vm.home}/vmcore/include/version_svn_tag.h" overwrite="true">
             <filterset>
                 <filter token="svn.revision" value="${svn.revision}"/>
+                <filter token="harmony.java.runtime.version"
+                        value="${harmony.java.runtime.version}" />
+                <filter token="harmony.java.specification.version"
+                        value="${harmony.java.specification.version}" />
             </filterset>
         </copy>
     </target>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag_orig.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag_orig.h?rev=810858&r1=810857&r2=810858&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag_orig.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag_orig.h Thu Sep  3 10:07:02
2009
@@ -19,5 +19,7 @@
 #define _VERSION_SVN_TAG_
 
 #define VERSION_SVN_TAG  "@svn.revision@"
+#define JAVA_RUNTIME_VERSION  "@harmony.java.runtime.version@"
+#define JAVA_SPECIFICATION_VERSION  "@harmony.java.specification.version@"
 
 #endif // _VERSION_SVN_TAG_

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?rev=810858&r1=810857&r2=810858&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Thu Sep  3 10:07:02
2009
@@ -167,8 +167,9 @@
     properties.set_new("java.vm.vendor", "Apache Software Foundation");
     properties.set_new("java.vm.name", "DRLVM");
     properties.set_new("java.runtime.name", "Apache Harmony");
-    properties.set_new("java.runtime.version", "1.5.0");
-    properties.set_new("java.specification.version", "1.5");
+    properties.set_new("java.runtime.version", JAVA_RUNTIME_VERSION);
+    properties.set_new("java.specification.version",
+                       JAVA_SPECIFICATION_VERSION);
     properties.set_new("java.specification.vendor", "Sun Microsystems Inc.");
     properties.set_new("java.specification.name", "Java Platform API Specification");
     properties.set_new("java.class.version", EXPAND(CLASSFILE_MAJOR_MAX) "."

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=810858&r1=810857&r2=810858&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Thu Sep  3 10:07:02 2009
@@ -427,6 +427,7 @@
         <propertyref name="hy.cfg" />
         <propertyref name="hy.local.zlib" />
         <propertyref name="use.libstdc++5" />
+        <propertyref name="harmony.java.version" />
     </propertyset>
     
     <target name="build-classlib" depends="auto-fetch-classlib-libs">



Mime
View raw message