Fix add_library for windows. Fix #308. Fix #227.

Adding paths to java.library.path in order to load a .dll wasn't working
on windows. I'm not sure how this is working on any platform, but
everything seems to be working fine. Split recursivelyAddToClasspath
into two different methods, one to add .jars to the classpath, and one
to load .dlls using the absolute file path.

These changes are only for the windows platform, all other platforms
function the old way.

Author: mpsftw

runtime/src/jycessing/LibraryImporter.java

@@ -29,6 +29,7 @@
 import org.python.google.common.base.Joiner;
 import org.python.util.InteractiveConsole;
 
+import processing.app.Platform;
 import processing.core.PApplet;
 
 /**
@@ -128,19 +129,63 @@ protected void addLibrary(final String libName) {
     if (libDir == null) {
       interp.exec("raise Exception('This sketch requires the \"" + libName + "\" library.')");
     }
+
     final File contentsDir = new File(libDir, "library");
     if (!contentsDir.exists()) {
       interp.exec("raise Exception('The library " + libName + " is malformed and won't import.')");
     }
     final File mainJar = new File(contentsDir, libName + ".jar");
 
-    recursivelyAddToClasspath(contentsDir);
+    log("mainJar: " + mainJar);
+    log("Adding dir: " + contentsDir);
+    if (Platform.isWindows()) {
+      final File nativeDir = new File(libDir, "library/windows" + Platform.getVariant());
+      recursivelyAddJarsToClasspath(contentsDir);
+      recursivelyLoadNativeLibraryies(nativeDir);
+    } else {
+      recursivelyAddToClasspath(contentsDir);
+    }
 
     if (mainJar.exists()) {
+      log("adding mainJar");
       importPublicClassesFromJar(mainJar);
     }
   }
 
+  private void recursivelyAddJarsToClasspath(final File contentsDir) {
+    final List<File> resources = findResources(contentsDir);
+    final PySystemState sys = Py.getSystemState();
+    for (final File resource : resources) {
+      final String name = resource.getName();
+      if (name.endsWith(".jar") || name.endsWith(".zip")) {
+        // Contains stuff we want
+        addJarToClassLoader(resource.getAbsoluteFile());
+
+        log("Appending " + resource.getAbsolutePath() + " to sys.path.");
+        sys.path.append(Py.newStringUTF8(resource.getAbsolutePath()));
+      } else if (resource.isDirectory()) {
+        recursivelyAddToClasspath(resource);
+      }
+    }
+  }
+
+  private void recursivelyLoadNativeLibraryies(final File contentsDir) {
+    final List<File> resources = findResources(contentsDir);
+    final PySystemState sys = Py.getSystemState();
+    for (final File resource : resources) {
+      final String name = resource.getName();
+      if (name.matches("^.*\\.(so|dll|dylib|jnilib)$")) {
+        // Add *containing directory* to native search path
+        log("addDirectoryToNativeSearchPath: " + resource.getAbsoluteFile().getParentFile().getAbsolutePath());
+        addDirectoryToNativeSearchPath(resource.getAbsoluteFile().getParentFile());
+        log("Loading library: " + resource.getAbsoluteFile().getName());
+        System.load(resource.getAbsolutePath());
+      } else if (resource.isDirectory()) {
+        recursivelyAddToClasspath(resource);
+      }
+    }
+  }
+
   private void recursivelyAddToClasspath(final File contentsDir) {
     final List<File> resources = findResources(contentsDir);
     final PySystemState sys = Py.getSystemState();
@@ -154,6 +199,7 @@ private void recursivelyAddToClasspath(final File contentsDir) {
         sys.path.append(Py.newStringUTF8(resource.getAbsolutePath()));
       } else if (name.matches("^.*\\.(so|dll|dylib|jnilib)$")) {
         // Add *containing directory* to native search path
+        log("addDirectoryToNativeSearchPath: " + resource.getAbsoluteFile().getParentFile().getName());
         addDirectoryToNativeSearchPath(resource.getAbsoluteFile().getParentFile());
       } else if (resource.isDirectory()) {
         recursivelyAddToClasspath(resource);

testmode.bat

@@ -0,0 +1,26 @@
+set VERBOSE_PYTHON_MODE=true
+
+set PROCESSINGPY=%CD%
+set PROCESSING=..\processing
+
+for /f "tokens=1,2*" %%A in ('reg query "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v "Personal" 2^>nul') do set MY_DOCS_ROOT=%%C
+
+set MODES=%MY_DOCS_ROOT%\Processing\modes
+set RUNPROCESSINGDIR=%PROCESSING%\build\windows\work
+
+cd /d %PROCESSINGPY%
+ant mode.zip
+
+cd /d %MODES%
+del /s /f /q PythonMode
+for /f %%f in ('dir /ad /b PythonMode') do rd /s /q PythonMode\%%f
+
+cd /d %PROCESSINGPY%\work
+powershell Expand-Archive PythonMode.zip -DestinationPath %MODES%
+
+cd /d %PROCESSINGPY%
+
+cd /d %RUNPROCESSINGDIR%
+.\java\bin\java -cp lib\pde.jar;core\library\core.jar;lib\jna.jar;lib\jna-platform.jar;lib\antlr.jar;lib\ant.jar;lib\ant-launcher.jar processing.app.Base
+
+cd %PROCESSINGPY%