44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
Index: scilab-6.1.0/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java
|
|
===================================================================
|
|
--- scilab-6.1.0.orig/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java
|
|
+++ scilab-6.1.0/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java
|
|
@@ -62,7 +62,7 @@ public class ClassPath {
|
|
*/
|
|
public static void addURL(final URL u, int i) {
|
|
|
|
- final URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
|
|
+ final URLClassLoader sysloader = new URLClassLoader (new URL[] {}, ClassLoader.getSystemClassLoader());
|
|
Class sysclass = URLClassLoader.class;
|
|
|
|
try {
|
|
@@ -94,12 +94,8 @@ public class ClassPath {
|
|
*/
|
|
public static String[] getClassPath() {
|
|
|
|
- URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
|
|
- URL[] path = sysloader.getURLs();
|
|
- String[] paths = new String[path.length];
|
|
- for (int i = 0; i < path.length; i++) {
|
|
- paths[i] = path[i].getFile();
|
|
- }
|
|
+ ClassLoader sysloader = ClassLoader.getSystemClassLoader();
|
|
+ String[] paths = {""};
|
|
return paths;
|
|
}
|
|
|
|
Index: scilab-6.1.0/bin/scilab
|
|
===================================================================
|
|
--- scilab-6.1.0.orig/bin/scilab
|
|
+++ scilab-6.1.0/bin/scilab
|
|
@@ -650,6 +650,10 @@ detect_java_vm() {
|
|
;;
|
|
esac
|
|
|
|
+ # Hack to enable frontloading all needed and optional jars during load; TO BE USED IN CONJUNCTION WITH RPM SPECFILE SED HACK
|
|
+ export _JAVA_OPTIONS="${_JAVA_OPTIONS} --add-modules=java.xml.bind,java.activation -Djava.class.path=@SPEC_ALL_JAR_CLASSPATHS@ -Djava.library.path=@SPEC_SCI_LIB_PATH@"
|
|
+
|
|
+
|
|
####### END OF JAVA ENV DETECTION/SETTING ######
|
|
}
|
|
|