moving core.jar and friends

benfry · benfry · commit f3fe7a1c1a08 · 2012-07-20T22:34:12.000Z
diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java
@@ -79,9 +79,14 @@ public boolean accept(File dir, String name) {
   };
 
 
-  public Library(File folder, String subfolder) {
+  public Library(File folder) {
+    this(folder, null);
+  }
+  
+  
+  public Library(File folder, String groupName) {
     super(folder, Library.propertiesFileName);
-    this.group = subfolder;
+    this.group = groupName;
 
     libraryFolder = new File(folder, "library");
     examplesFolder = new File(folder, "examples");
@@ -462,7 +467,7 @@ static protected void list(File folder, ArrayList<Library> libraries) {
     discover(folder, librariesFolders);
     
     for (File baseFolder : librariesFolders) {
-      libraries.add(new Library(baseFolder, null));
+      libraries.add(new Library(baseFolder));
     }
     
     String[] list = folder.list(junkFolderFilter);
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -45,6 +45,9 @@ public abstract class Mode {
 
   public ArrayList<Library> coreLibraries;
   public ArrayList<Library> contribLibraries;
+  
+  /** Library folder for core. (Used for OpenGL in particular.) */
+  protected Library coreLibrary;
 
 
   public Mode(Base base, File folder) {
@@ -144,6 +147,11 @@ public void rebuildLibraryList() {
   }
 
 
+  public Library getCoreLibrary() {
+    return null;
+  }
+  
+  
   public Library getLibrary(String pkgName) throws SketchException {
     ArrayList<Library> libraries = importToLibraryTable.get(pkgName);
     if (libraries == null) {
diff --git a/app/src/processing/app/contrib/ContributionManager.java b/app/src/processing/app/contrib/ContributionManager.java
@@ -187,7 +187,7 @@ static File getSketchbookContribFolder(Base base, Type type) {
   static InstalledContribution create(Base base, Type type, File folder) {
     switch (type) {
     case LIBRARY:
-      return new Library(folder, null);
+      return new Library(folder);
     case LIBRARY_COMPILATION:
       return LibraryCompilation.create(folder);
     case TOOL:
diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java
@@ -59,11 +59,9 @@ public class JavaBuild {
    */
   private String javaLibraryPath;
 
-  /**
-   * List of library folders, as figured out during preprocessing.
-   */
+  /** List of library folders, as figured out during preprocessing. */
   private ArrayList<Library> importedLibraries;
-
+  
 
   public JavaBuild(Sketch sketch) {
     this.sketch = sketch;
diff --git a/app/src/processing/mode/java/JavaMode.java b/app/src/processing/mode/java/JavaMode.java
@@ -29,6 +29,7 @@
 import processing.app.Base;
 import processing.app.Editor;
 import processing.app.EditorState;
+import processing.app.Library;
 import processing.app.Mode;
 import processing.app.RunnerListener;
 import processing.app.Sketch;
@@ -167,7 +168,16 @@ public String[] getIgnorable() {
       "application.linux"
     };
   }
-
+  
+  
+  public Library getCoreLibrary() {
+    if (coreLibrary == null) {
+      File coreFolder = Base.getContentFile("core");
+      coreLibrary = new Library(coreFolder, null);
+    }
+    return coreLibrary;
+  }
+  
   
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
diff --git a/build/build.xml b/build/build.xml
@@ -28,7 +28,8 @@
 
   <!-- Libraries required for running processing -->
   <fileset dir=".." id="runtime.jars">
-    <include name="core/core.jar" />
+    <!--<include name="core/library/core.jar" />-->
+    <include name="core/library" />
     <include name="app/pde.jar" />
     <include name="app/lib/antlr.jar" />
     <include name="app/lib/ecj.jar" />
diff --git a/core/build.xml b/core/build.xml
@@ -3,7 +3,7 @@
 
   <target name="clean" description="Clean out the build directories">
     <delete dir="bin" />
-    <delete file="core.jar" />
+    <delete file="library/core.jar" />
   </target>
   
   <target name="compile" description="Compile">
@@ -33,7 +33,7 @@
   </target>		
 
   <target name="build" depends="compile" description="Build core library">
-    <jar basedir="bin" destfile="core.jar" />
+    <jar basedir="bin" destfile="library/core.jar" />
   </target>
   
 </project>
diff --git a/core/library/export.txt b/core/library/export.txt
@@ -0,0 +1,10 @@
+# If you want to support more platforms, visit jogamp.org to get the 
+# natives libraries for the platform in question (i.e. Solaris). 
+
+name = OpenGL
+
+application.macosx=opengl.jar,jogl.all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar
+application.windows32=opengl.jar,jogl.all.jar,gluegen-rt.jar,jogl-all-natives-windows-i586.jar,gluegen-rt-natives-windows-i586.jar
+application.windows64=opengl.jar,jogl.all.jar,gluegen-rt.jar,jogl-all-natives-windows-amd64.jar,gluegen-rt-natives-windows-amd64.jar
+application.linux32=opengl.jar,jogl.all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar
+application.linux64=opengl.jar,jogl.all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar
diff --git a/todo.txt b/todo.txt
@@ -8,6 +8,10 @@ Have you added an NSPrincipalClass to your Info.plist, and are using a JavaAppli
 _ Check out the desktop property. Unfortunately, it won't tell you *which* display is running in HiDPI, but it will stay up-to-date with live display changes (like a Retina-display being plugged and unplugged). If you query the property after each GraphicsEnvironment display change event, you should be able to live switch in and out of HiDPI.
 java.awt.Toolkit.getDefaultToolkit().getDesktopProperty("apple.awt.contentScaleFactor");
 
+_ launch moviemaker as separate Java process (to disable Quaqua)
+_ or selectively disable parts to see which is causing the trouble
+_   http://www.randelshofer.ch/quaqua/guide/tailoring.html
+
 recent/open
 X add EditorState class, device-aware placement
 X   get rid of restore sketch feature
