mirror of
https://github.com/processing/processing4.git
synced 2026-02-11 17:40:48 +01:00
get code folder working again with applets
This commit is contained in:
@@ -780,20 +780,6 @@ public class JavaBuild {
|
||||
// Add the manifest file
|
||||
addManifest(zos);
|
||||
|
||||
if (sketch.hasCodeFolder()) {
|
||||
File[] codeJarFiles = sketch.getCodeFolder().listFiles(new FilenameFilter() {
|
||||
public boolean accept(File dir, String name) {
|
||||
if (name.charAt(0) == '.') return false;
|
||||
if (name.toLowerCase().endsWith(".jar")) return true;
|
||||
if (name.toLowerCase().endsWith(".zip")) return true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
for (File exportFile : codeJarFiles) {
|
||||
Base.copyFile(exportFile, new File(appletFolder, exportFile.getName()));
|
||||
}
|
||||
}
|
||||
|
||||
// File openglLibraryFolder =
|
||||
// new File(editor.getMode().getLibrariesFolder(), "opengl/library");
|
||||
// String openglLibraryPath = openglLibraryFolder.getAbsolutePath();
|
||||
@@ -813,7 +799,7 @@ public class JavaBuild {
|
||||
System.err.println("File " + exportFile.getAbsolutePath() + " does not exist");
|
||||
|
||||
} else if (exportFile.isDirectory()) {
|
||||
System.err.println("Ignoring sub-folder \"" + exportFile.getAbsolutePath() + "\"");
|
||||
System.out.println("Ignoring sub-folder \"" + exportFile.getAbsolutePath() + "\"");
|
||||
|
||||
} else if (exportName.toLowerCase().endsWith(".zip") ||
|
||||
exportName.toLowerCase().endsWith(".jar")) {
|
||||
@@ -842,6 +828,22 @@ public class JavaBuild {
|
||||
String bagelJarPath = bagelJar.getAbsolutePath();
|
||||
packClassPathIntoZipFile(bagelJarPath, zos, zipFileContents);
|
||||
}
|
||||
|
||||
if (sketch.hasCodeFolder()) {
|
||||
File[] codeJarFiles = sketch.getCodeFolder().listFiles(new FilenameFilter() {
|
||||
public boolean accept(File dir, String name) {
|
||||
if (name.charAt(0) == '.') return false;
|
||||
if (name.toLowerCase().endsWith(".jar")) return true;
|
||||
if (name.toLowerCase().endsWith(".zip")) return true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
for (File exportFile : codeJarFiles) {
|
||||
String name = exportFile.getName();
|
||||
Base.copyFile(exportFile, new File(appletFolder, name));
|
||||
archives.append("," + name);
|
||||
}
|
||||
}
|
||||
|
||||
// if (dataFolder.exists()) {
|
||||
// String dataFiles[] = Base.listFiles(dataFolder, false);
|
||||
|
||||
18
todo.txt
18
todo.txt
@@ -93,13 +93,19 @@ _ window that opens and contains list of examples
|
||||
_ also, move open to a submenu?
|
||||
_ then we'd have open / recent / sketchbook
|
||||
|
||||
regressions
|
||||
X test code folder on desktop
|
||||
X with applet
|
||||
X with application
|
||||
_ test controlp5 on app
|
||||
_ test controlp5 on applet
|
||||
_ test code folder on android
|
||||
_ test libraries on android
|
||||
_ test opengl on android
|
||||
|
||||
_ library/export testing
|
||||
_ test controlp5
|
||||
_ test code folder on desktop
|
||||
_ test code folder on android
|
||||
_ test libraries on android
|
||||
_ test opengl on android
|
||||
_ strange window flicker when first opened
|
||||
|
||||
_ make sure that android is working again
|
||||
|
||||
_ the build is broken! the build is broken!
|
||||
_ http://code.google.com/p/processing/issues/detail?id=519
|
||||
|
||||
Reference in New Issue
Block a user