[Git][java-team/netlib-java][master] 3 commits: Revert unsuccessful attempt to fix missing classes issue

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Java Maintainers / netlib-java


Commits:
ac83acac by Andreas Tille at 2019-03-26T15:45:01Z
Revert unsuccessful attempt to fix missing classes issue

- - - - -
865d491b by Andreas Tille at 2019-03-26T15:47:22Z
Fix URLClassLoader

- - - - -
e5d9a682 by Andreas Tille at 2019-03-26T15:50:33Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/URLClassLoader.patch
- − debian/patches/add_compile_target.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,9 @@
-netlib-java (0.9.3-5) UNRELEASED; urgency=medium
+netlib-java (0.9.3-5) unstable; urgency=medium
 
-  * Add compile target to build.xml (no idea how that ever has build before)
+  * Fix URLClassLoader
     Closes: #923759
 
- -- Andreas Tille <tille at debian.org>  Thu, 21 Mar 2019 13:41:22 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 26 Mar 2019 16:47:32 +0100
 
 netlib-java (0.9.3-4) unstable; urgency=medium
 


=====================================
debian/patches/URLClassLoader.patch
=====================================
@@ -0,0 +1,48 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 25 Mar 2019 14:44:22 +0100
+Bug-Debian: https://bugs.debian.org/923759
+Subject: URLClassLoader
+
+---
+ src/org/netlib/generate/JavaGenerator.java | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/netlib/generate/JavaGenerator.java b/src/org/netlib/generate/JavaGenerator.java
+index fda8e9d..15815de 100644
+--- a/src/org/netlib/generate/JavaGenerator.java
++++ b/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;
+ 
++import java.net.MalformedURLException;
++
+ /**
+  * Due to the depressing number of LAPACK routines, it is much more efficient to
+  * auto-generate the Java code for the wrapper and corresponding Java and JNI
+@@ -643,7 +645,8 @@ class JavaGenerator {
+ 	 * @return all classes in a given package
+ 	 * @see http://forum.java.sun.com/thread.jspa?threadID=757391&messageID=4326850
+ 	 */
+-	private List<Class<?>> getClasses(String packageName, IClassFilter filter) {
++	private List<Class<?>> getClasses(String packageName, IClassFilter filter)
++		throws MalformedURLException{
+ 		String packagePath = packageName.replace('.', '/');
+ //		ArrayList<URL> classpath = new ArrayList<URL>();
+ //		String[] classpathString = System.getProperty("java.class.path").split(":");
+@@ -658,7 +661,14 @@ class JavaGenerator {
+ //					log(Level.SEVERE, classpathString[i] + " " + ex.getMessage());
+ //			}
+ //		}
+-		URL [] classpath = ((URLClassLoader) ClassLoader.getSystemClassLoader()).getURLs();
++		URL url1 = new URL("file:///usr/share/java/junit-3.8.2.jar");
++		URL url2 = new URL("file:///usr/share/java/f2jutil-0.8.1.jar");
++		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:///build/netlib-java-0.9.3/build/classes/");
++
++		URL [] classpath = { url1, url2, url3, url4, url5, url6 };
+ 		List<Class<?>> result = new ArrayList<Class<?>>();
+ 		System.out.println(Arrays.toString(classpath));
+ 		for (URL url : classpath) {


=====================================
debian/patches/add_compile_target.patch deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Add compile target to build.xml (no idea how that ever has build before)
-Bug-Debian: https://bugs.debian.org/923759 
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 21 Mar 2019 13:41:22 +0100
-
---- a/build.xml
-+++ b/build.xml
-@@ -2,6 +2,7 @@
- <project name="org.netlib" default="default" basedir=".">
- 	<description>Builds, tests, and runs the project org.netlib.</description>
- 	<property name="version" value="0.9.3" />
-+	<property name="src.dir" value="src"/>
- 	<!-- REMINDER: When bumping the version value, also bump the value in jni/configure -->
- 	<import file="nbproject/build-impl.xml"/>
- 	
-@@ -23,6 +24,12 @@
- 		</delete>
- 		<delete dir="jni/ARPACK"/>
- 	</target>
-+    <target name="compile" description="compiles netlib code">
-+        <javac srcdir="${src.dir}"
-+        sourcepath="${src.dir}"
-+        debug="true">
-+        </javac>
-+    </target>
- 	<target name="generate" depends="compile">
- 		<!-- Autogenerate the Java and C files -->
- 		<java fork="yes" classname="org.netlib.generate.JavaGenerator" classpath="${run.classpath}" />


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,2 @@
 update_classpath.patch
-add_compile_target.patch
+URLClassLoader.patch



View it on GitLab: https://salsa.debian.org/java-team/netlib-java/compare/da4055377617ea59e92675088be41600e16a326d...e5d9a682e349f9a4bacada3ce1766a0cd8c5b93a

-- 
View it on GitLab: https://salsa.debian.org/java-team/netlib-java/compare/da4055377617ea59e92675088be41600e16a326d...e5d9a682e349f9a4bacada3ce1766a0cd8c5b93a
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/20190326/0e24d16e/attachment.html>