[Git][java-team/netlib-java][master] 7 commits: Add patch to set source to 1.8
Andreas Tille
gitlab at salsa.debian.org
Sun Mar 31 21:11:50 BST 2019
Andreas Tille pushed to branch master at Debian Java Maintainers / netlib-java
Commits:
6f6ef214 by Dominik Stadler at 2019-03-26T20:01:39Z
Add patch to set source to 1.8
- - - - -
9ca8d67c by Dominik Stadler at 2019-03-26T20:02:45Z
Add failonerror to generate-task to stop build on error
- - - - -
af820907 by Dominik Stadler at 2019-03-26T20:04:42Z
Add changelog
- - - - -
59a4a6e5 by Dominik Stadler at 2019-03-26T20:06:57Z
Fix URLClassLoader.patch to actually work
- - - - -
cc7a570c by Dominik Stadler at 2019-03-26T20:09:35Z
Re-add Bug-Debian note
- - - - -
7d5be408 by Dominik Stadler at 2019-03-31T18:37:39Z
Merge remote-tracking branch 'origin/master' into bug_923759
- - - - -
6ccdf7de by Andreas Tille at 2019-03-31T20:11:43Z
Merge branch 'bug_923759' into 'master'
Bug 923759
See merge request java-team/netlib-java!2
- - - - -
5 changed files:
- debian/changelog
- debian/patches/URLClassLoader.patch
- + debian/patches/fail_when_generate_fails.patch
- debian/patches/series
- + debian/patches/set_source_1_8.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+netlib-java (0.9.3-6.1) unstable; urgency=medium
+
+ * Add patch to set source to 1.8 as 1.5 is not supported with JDK 11
+ * Add patch to fail on generate-task to not hide errors in build-output
+ * Add patch to use a fixed list for the classpath to allow building on JDK
+ 11 (Closes: #923759)
+
+ -- Dominik Stadler (Ubuntu key) <dominik.stadler at gmx.at> Tue, 26 Mar 2019 20:51:44 +0100
+
netlib-java (0.9.3-6) unstable; urgency=medium
* Drop /build/netlib-java-0.9.3 from URLs
=====================================
debian/patches/URLClassLoader.patch
=====================================
@@ -7,8 +7,10 @@ Subject: URLClassLoader
src/org/netlib/generate/JavaGenerator.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
---- a/src/org/netlib/generate/JavaGenerator.java
-+++ b/src/org/netlib/generate/JavaGenerator.java
+Index: netlib-java/src/org/netlib/generate/JavaGenerator.java
+===================================================================
+--- netlib-java.orig/src/org/netlib/generate/JavaGenerator.java
++++ netlib-java/src/org/netlib/generate/JavaGenerator.java
@@ -51,6 +51,8 @@ import org.netlib.util.doubleW;
import org.netlib.util.floatW;
import org.netlib.util.intW;
@@ -28,7 +30,7 @@ Subject: URLClassLoader
String packagePath = packageName.replace('.', '/');
// ArrayList<URL> classpath = new ArrayList<URL>();
// String[] classpathString = System.getProperty("java.class.path").split(":");
-@@ -658,7 +661,13 @@ class JavaGenerator {
+@@ -658,7 +661,14 @@ class JavaGenerator {
// log(Level.SEVERE, classpathString[i] + " " + ex.getMessage());
// }
// }
@@ -38,8 +40,19 @@ Subject: URLClassLoader
+ URL url3 = new URL("file:///usr/share/java/jlapack-blas-0.8.jar");
+ URL url4 = new URL("file:///usr/share/java/jlapack-lapack-0.8.jar");
+ URL url5 = new URL("file:///usr/share/java/jlapack-xerbla-0.8.jar");
++ URL url6 = new URL("file://" + new File(".").getAbsolutePath() + "/build/classes/");
+
-+ URL [] classpath = { url1, url2, url3, url4, url5 };
++ URL [] classpath = { url1, url2, url3, url4, url5, url6 };
List<Class<?>> result = new ArrayList<Class<?>>();
System.out.println(Arrays.toString(classpath));
for (URL url : classpath) {
+@@ -700,6 +710,9 @@ class JavaGenerator {
+ // class path is a directory
+ File packageDirectory =
+ new File(file.getPath() + "/" + packagePath);
++ if(packageDirectory.listFiles() == null) {
++ throw new IllegalStateException("Could not find directory " + packageDirectory + " at " + packageDirectory.getAbsolutePath());
++ }
+ for (File f : packageDirectory.listFiles()) {
+ if (f.getPath().endsWith(".class")) {
+ String className =
=====================================
debian/patches/fail_when_generate_fails.patch
=====================================
@@ -0,0 +1,13 @@
+Index: netlib-java/build.xml
+===================================================================
+--- netlib-java.orig/build.xml
++++ netlib-java/build.xml
+@@ -25,7 +25,7 @@
+ </target>
+ <target name="generate" depends="compile">
+ <!-- Autogenerate the Java and C files -->
+- <java fork="yes" classname="org.netlib.generate.JavaGenerator" classpath="${run.classpath}" />
++ <java fork="yes" classname="org.netlib.generate.JavaGenerator" classpath="${run.classpath}" failonerror="true"/>
+ </target>
+
+ <!--
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
update_classpath.patch
+set_source_1_8.patch
URLClassLoader.patch
+fail_when_generate_fails.patch
=====================================
debian/patches/set_source_1_8.patch
=====================================
@@ -0,0 +1,20 @@
+From: Dominik Stadler <dominik.stadler at gmx.at>
+Date: Tue, 26 Mar 2019 19:20:22 +0100
+Subject: set_source_1.8
+
+---
+Index: netlib-java/nbproject/project.properties
+===================================================================
+--- netlib-java.orig/nbproject/project.properties
++++ netlib-java/nbproject/project.properties
+@@ -28,8 +28,8 @@ javac.classpath=\
+ # Space-separated list of extra javac options
+ javac.compilerargs=
+ javac.deprecation=false
+-javac.source=1.5
+-javac.target=1.5
++javac.source=1.8
++javac.target=1.8
+ javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
View it on GitLab: https://salsa.debian.org/java-team/netlib-java/compare/8f8fbb392dfd5a585c9bf8465a1c27a94bb52ac9...6ccdf7de455c6df0562457c777fecf50a46fcd86
--
View it on GitLab: https://salsa.debian.org/java-team/netlib-java/compare/8f8fbb392dfd5a585c9bf8465a1c27a94bb52ac9...6ccdf7de455c6df0562457c777fecf50a46fcd86
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190331/b2154007/attachment.html>
More information about the pkg-java-commits
mailing list