Merge pull request #6 from OpenBCI/v2-mac-bug-fix

Update dynamic library on Mac to look in parent of jar directory

Author: retiutut

README.md

@@ -2,16 +2,19 @@
 
 Helpers for [OpenBCI GUI](https://github.com/OpenBCI/OpenBCI_GUI)
 
-Built using Github Actions for all OS. The .dylib files for Mac are also provided as an artifact.
+Built using Github Actions for all OS. The .dylib files for Mac are also provided as an artifact. These files should be included in the `libraries` folder outside of the .jar file as shown below. As a result, we do not need to extract them from the .jar file on Mac.
 
 When updating this library in the GUI, use the following folder structure:
 
 - GUI Repo Root Directory
-    - OpenBCI_GUI
-        - libraries
-            - openbci_gui_helpers
-                - library
-                    - `openbci_gui_helpers.jar`
+  - OpenBCI_GUI
+    - libraries
+      - openbci_gui_helpers
+        - library
+          - `openbci_gui_helpers.jar`
+          - `libGanglionNativeScan.dylib`
+          - `libGanglionScan.dylib`
+
+## License:
 
-## License: 
 MIT

java-package/openbci_gui_helpers/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>openbci_gui_helpers</groupId>
   <artifactId>openbci_gui_helpers</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1</version>
 
   <name>openbci_gui_helpers</name>
   <url>https://github.com/OpenBCI/OpenBCI_GUI_Helpers</url>

java-package/openbci_gui_helpers/src/main/java/openbci_gui_helpers/GUIHelper.java

@@ -33,7 +33,7 @@ private interface DllNativeInterface extends Library
 
     private static DllInterface instance;
     private static DllNativeInterface instance_native;
-    private static final String VERSION = "2.0.0";
+    private static final String VERSION = "2.0.1";
 
     static
     {
@@ -74,8 +74,6 @@ private static String unpack_from_jar (String lib_name)
                 String jarPath = GUIHelper.class.getProtectionDomain().getCodeSource().getLocation().getPath();
                 File jarFile = new File(jarPath);
                 String libPathString = jarFile.getParentFile().getAbsolutePath() + File.separator + lib_name;
-                Path libPath = Paths.get(libPathString);
-                Files.copy (link, libPath);
                 return libPathString;
             } else {
                 Files.copy (link, file.getAbsoluteFile ().toPath ());
@@ -87,9 +85,6 @@ private static String unpack_from_jar (String lib_name)
             System.err.println("native library: " + lib_name + " is not found in jar file");
             System.err.println("file absolute to path: " + file.getAbsoluteFile().toPath());
             System.err.println("file get absolute path: " + file.getAbsolutePath());
-            if (SystemUtils.IS_OS_MAC) {
-                return file.getAbsolutePath();
-            }
             return "";
         }
     }