[PATCH] add suport for new JVM versions

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2884

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/2884/1

add suport for new JVM versions

Change-Id: I751e67aefabbb895490cdb8ea4cb522f19d23715
---
M codemaker/source/javamaker/classfile.cxx
M configure.ac
2 files changed, 17 insertions(+), 2 deletions(-)



diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index 0f115b2..a79c920 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -651,6 +651,8 @@
     writeU4(file, 0xCAFEBABE);
     writeU2(file, 0);
     writeU2(file, 49); // class file version of JRE 1.5
+    //writeU2(file, 50); // class file version of JRE 1.6
+    //writeU2(file, 51); // class file version of JRE 1.7
     writeU2(file, m_constantPoolCount);
     writeStream(file, m_constantPool);
     writeU2(file, static_cast< sal_uInt16 >(m_accessFlags));
diff --git a/configure.ac b/configure.ac
index 75d64a3..f65ccd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1620,6 +1620,14 @@
     ],
 ,with_junit=yes)
 
+AC_ARG_WITH(java-version,
+    AS_HELP_STRING([--with-java-version],
+        [Specifiy java version. Default is 1.5.])
+    [
+                          Usage:     --with-java-version=1.6|1.7|...>
+    ],
+,)
+
 AC_ARG_WITH(perl-home,
     AS_HELP_STRING([--with-perl-home],
         [If you have installed Perl 5 Distribution, on your system, please
@@ -6127,8 +6135,13 @@
 dnl Set target Java bytecode version
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
-    _java_target_ver="1.5"
-
+AC_MSG_CHECKING([which java version to use])
+    if test -z "$with_java_version"; then
+        _java_target_ver="1.5"
+    else
+       _java_target_ver="$with_java_version"
+    fi
+    AC_MSG_RESULT([$_java_target_ver])
     JAVA_SOURCE_VER="$_java_target_ver"
     JAVA_TARGET_VER="$_java_target_ver"
 fi

-- 
To view, visit https://gerrit.libreoffice.org/2884
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I751e67aefabbb895490cdb8ea4cb522f19d23715
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky <David.Ostrovsky at gmx.de>