ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-21 03:55:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Set java.vm.info based on makefile info= and

Browse Source 
set java.vm.version based on makefile version=
in order to display relevant OpenJDK -version information.

Signed-off-by: Matthias Klose <doko@ubuntu.com>
Signed-off-by: Xerxes Rånby <xerxes@zafena.se>
This commit is contained in:
Xerxes Rånby 2012-09-05 14:31:30 +02:00
parent 24f682f5b6
commit db0c14d742
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefile
View File

@ -194,6 +194,7 @@ target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
common-cflags = $(warnings) -fno-rtti -fno-exceptions -I$(classpath-src) \ common-cflags = $(warnings) -fno-rtti -fno-exceptions -I$(classpath-src) \
"-I$(JAVA_HOME)/include" -idirafter $(src) -I$(build) $(classpath-cflags) \ "-I$(JAVA_HOME)/include" -idirafter $(src) -I$(build) $(classpath-cflags) \
-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -DAVIAN_VERSION=\"$(version)\" \ -D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -DAVIAN_VERSION=\"$(version)\" \
-DAVIAN_INFO="\"$(info)\"" \
-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \ -DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" $(target-cflags) -DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" $(target-cflags)

6
src/classpath-openjdk.cpp
View File

@ -3006,6 +3006,12 @@ jvmInitProperties(Thread* t, uintptr_t* arguments)
"Avian Contributors"); "Avian Contributors");
local::setProperty(t, method, *properties, "java.vm.name","Avian"); local::setProperty(t, method, *properties, "java.vm.name","Avian");
#ifdef AVIAN_VERSION
local::setProperty(t, method, *properties, "java.vm.version",AVIAN_VERSION);
#endif
#ifdef AVIAN_INFO
local::setProperty(t, method, *properties, "java.vm.info",AVIAN_INFO);
#endif
local::setProperty local::setProperty
(t, method, *properties, "java.home", (t, method, *properties, "java.home",