File octave-java-use-source-target-1_6.patch of Package octave

Overview Repositories Revisions Requests Users Attributes Meta

File octave-java-use-source-target-1_6.patch of Package octave

# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1503469686 25200
# Node ID 20c83f6191028871b7ebd568cb93485cdee45244
# Parent  712736d43124183e64ef96c581b5e43dba0f2672
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)

* scripts/java/module.mk (%.class): Compile Java with -source 1.6 -target 1.6.
* ov-java.cc (octave::JVMArgs::JVMArgs, initialize_jvm, thread_jni_env): Use
JNI_VERSION_1_6 to initialize the JVM.  Thanks to Ernst Reissner for the
suggestion.

Index: octave-4.2.1/libinterp/octave-value/ov-java.cc
===================================================================
--- octave-4.2.1.orig/libinterp/octave-value/ov-java.cc
+++ octave-4.2.1/libinterp/octave-value/ov-java.cc
@@ -190,7 +190,7 @@ namespace octave
 
     JVMArgs (void)
     {
-      vm_args.version = JNI_VERSION_1_2;
+      vm_args.version = JNI_VERSION_1_6;
       vm_args.nOptions = 0;
       vm_args.options = 0;
       vm_args.ignoreUnrecognized = false;
@@ -590,12 +590,12 @@ initialize_jvm (void)
       // At least one JVM exists, try to attach to it
 
       switch (jvm->GetEnv (reinterpret_cast<void **> (&current_env),
-                           JNI_VERSION_1_2))
+                           JNI_VERSION_1_6))
         {
         case JNI_EDETACHED:
           // Attach the current thread
           JavaVMAttachArgs vm_args;
-          vm_args.version = JNI_VERSION_1_2;
+          vm_args.version = JNI_VERSION_1_6;
           vm_args.name = const_cast<char *> ("octave");
           vm_args.group = 0;
           if (jvm->AttachCurrentThread (reinterpret_cast<void **> (&current_env),
@@ -709,7 +709,7 @@ thread_jni_env (void)
   JNIEnv *env = 0;
 
   if (jvm)
-    jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_2);
+    jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_6);
 
   return env;
 }
Index: octave-4.2.1/scripts/java/module.mk
===================================================================
--- octave-4.2.1.orig/scripts/java/module.mk
+++ octave-4.2.1/scripts/java/module.mk
@@ -36,7 +36,10 @@ scripts_java_JAVA_CLASSES = $(addprefix
 
 $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
 	$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
-		( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
+	( cd $(srcdir)/scripts/java; \
+	  "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \
+	             -d $(abs_top_builddir)/scripts/java \
+	             $(org_octave_dir)/$(<F) )
 
 if AMCOND_HAVE_JAVA
 scripts/java/octave.jar: $(scripts_java_JAVA_CLASSES)
@@ -59,7 +62,6 @@ PKG_ADD_FILES += scripts/java/PKG_ADD
 DIRSTAMP_FILES += scripts/java/$(octave_dirstamp)
 
 scripts_EXTRA_DIST += \
-  $(scripts_java_JAR_FILES) \
   $(scripts_java_JAVA_SRC)
 
 scripts_CLEANFILES += \

Places

File octave-java-use-source-target-1_6.patch of Package octave

Places