mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
Also look into the modules folder for native jars (#1345)
This commit is contained in:
@@ -1,14 +1,17 @@
|
||||
package processing.app;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
import processing.app.contrib.*;
|
||||
import processing.core.*;
|
||||
import processing.app.contrib.ContributionType;
|
||||
import processing.app.contrib.LocalContribution;
|
||||
import processing.core.PApplet;
|
||||
import processing.data.StringDict;
|
||||
import processing.data.StringList;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FilenameFilter;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
|
||||
public class Library extends LocalContribution {
|
||||
// static final String[] platformNames = PConstants.platformNames;
|
||||
@@ -398,27 +401,24 @@ public class Library extends LocalContribution {
|
||||
// so that it can be appended to other paths safely
|
||||
public String getClassPath() {
|
||||
StringBuilder cp = new StringBuilder();
|
||||
|
||||
String[] jarHeads = libraryFolder.list(jarFilter);
|
||||
if (jarHeads != null) {
|
||||
for (String jar : jarHeads) {
|
||||
cp.append(File.pathSeparatorChar);
|
||||
cp.append(new File(libraryFolder, jar).getAbsolutePath());
|
||||
}
|
||||
}
|
||||
addJars(libraryFolder, cp);
|
||||
File nativeLibraryFolder = new File(nativeLibraryPath);
|
||||
if (!libraryFolder.equals(nativeLibraryFolder)) {
|
||||
jarHeads = new File(nativeLibraryPath).list(jarFilter);
|
||||
if (jarHeads != null) {
|
||||
for (String jar : jarHeads) {
|
||||
cp.append(File.pathSeparatorChar);
|
||||
cp.append(new File(nativeLibraryPath, jar).getAbsolutePath());
|
||||
}
|
||||
}
|
||||
addJars(nativeLibraryFolder, cp);
|
||||
addJars(new File(nativeLibraryFolder, "modules"), cp);
|
||||
}
|
||||
return cp.toString();
|
||||
}
|
||||
|
||||
private void addJars(File folder, StringBuilder cp) {
|
||||
String[] jarHeads = folder.list(jarFilter);
|
||||
if (jarHeads != null) {
|
||||
for (String jar : jarHeads) {
|
||||
cp.append(File.pathSeparatorChar);
|
||||
cp.append(new File(folder, jar).getAbsolutePath());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String getNativePath() {
|
||||
return nativeLibraryPath;
|
||||
|
||||
Reference in New Issue
Block a user