eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 05:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem with library loading in 0178 (bug #1473)

Browse Source
This commit is contained in:
benfry
2010-03-10 17:57:11 +00:00
parent cb601df611
commit 192aabc63e
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/processing/app/Sketch.java
View File

@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2004-09 Ben Fry and Casey Reas
Copyright (c) 2004-10 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
@@ -92,6 +92,9 @@ public class Sketch {
* DLLs or JNILIBs.
*/
private String libraryPath;
/**
* List of library folders.
*/
private ArrayList<File> importedLibraries;
/**
@@ -1403,7 +1406,7 @@ public class Sketch {
File libFolder = (File) Base.importToLibraryTable.get(entry);
if (libFolder != null) {
getImportedLibraries().add(libFolder);
importedLibraries.add(libFolder);
classPath += Compiler.contentsToClassPath(libFolder);
libraryPath += File.pathSeparator + libFolder.getAbsolutePath();
}
@@ -1784,7 +1787,7 @@ public class Sketch {
// if a file called 'export.txt' is in there, it contains
// a list of the files that should be exported.
// otherwise, all files are exported.
for (File libraryFolder : getImportedLibraries()) {
for (File libraryFolder : importedLibraries) {
// in the list is a File object that points the
// library sketch's "library" folder
File exportSettings = new File(libraryFolder, "export.txt");
@@ -2424,7 +2427,7 @@ public class Sketch {
// if a file called 'export.txt' is in there, it contains
// a list of the files that should be exported.
// otherwise, all files are exported.
for (File libraryFolder : getImportedLibraries()) {
for (File libraryFolder : importedLibraries) {
//System.out.println(libraryFolder + " " + libraryFolder.getAbsolutePath());
// in the list is a File object that points the
// library sketch's "library" folder

19
build/build.xml
View File

@@ -96,29 +96,22 @@
<!-- copy libraries for dxf, pdf, etc. -->
<copy todir="${target.path}/libraries/dxf">
<fileset dir="../dxf/library" />
<fileset dir="../dxf/src" />
<fileset dir="../dxf" includes="library/**,src/**" />
</copy>
<copy todir="${target.path}/libraries/net">
<fileset dir="../net/library" />
<fileset dir="../net/src" />
<fileset dir="../net" includes="library/**,src/**" />
</copy>
<copy todir="${target.path}/libraries/opengl">
<fileset dir="../opengl/library" />
<fileset dir="../opengl/src" />
<fileset dir="../opengl" includes="library/**,src/**" />
</copy>
<copy todir="${target.path}/libraries/pdf">
<fileset dir="../pdf/library" />
<fileset file="../pdf/notes.txt" />
<fileset dir="../pdf/src" />
<fileset dir="../pdf" includes="library/**,src/**" />
</copy>
<copy todir="${target.path}/libraries/serial">
<fileset dir="../serial/library" />
<fileset dir="../serial/src" />
<fileset dir="../serial" includes="library/**,src/**" />
</copy>
<copy todir="${target.path}/libraries/video">
<fileset dir="../video/library" />
<fileset dir="../video/src" />
<fileset dir="../video" includes="library/**,src/**" />
</copy>
<!-- Unzip documentation + examples -->

6
todo.txt
View File

@@ -1,10 +1,11 @@
0179 pde
X another fix for CDATA section in applet.html for exported applets
X updated about.jpg
X Cannot find PDF library
X http://dev.processing.org/bugs/show_bug.cgi?id=1473
_ new examples.zip (write build.xml file for it)
_ finish build instructions for 1.1
_ pdf library is broken
_ bring back old-style textAscent()
_ pdf library - warn about the black boxes
_ or figure out how to get alpha text to work
@@ -20,9 +21,6 @@ _ make sure that get() and set() (for pixels and subsets) work w/ loaded images
_ make sure that get() and set() (for pixels and subsets) work w/ P2D
_ make sure that get() and set() (for pixels and subsets) work w/ P3D
_ Cannot find PDF library
_ http://dev.processing.org/bugs/show_bug.cgi?id=1473
_ change command line to just be part of regular distros
_ there's so much platform code in there, it's not worth the extra work
_ also include update check for logging