From commits-return-60050-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Thu Sep 03 10:07:31 2009 Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 19905 invoked from network); 3 Sep 2009 10:07:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Sep 2009 10:07:30 -0000 Received: (qmail 2071 invoked by uid 500); 3 Sep 2009 10:07:30 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 2026 invoked by uid 500); 3 Sep 2009 10:07:30 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 2017 invoked by uid 99); 3 Sep 2009 10:07:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 10:07:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 10:07:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A039A238890B; Thu, 3 Sep 2009 10:07:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090903100703.A039A238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + + + + + + + + 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 @@ +