* Allow Builder to create links for resource libraries even when n…

…o Java classes are built * Fix `Loader.cacheResource()` creating a subdirectory named "null" when caching a top-level file
bytedeco · Aug 17, 2018 · 00cd483 · 00cd483
1 parent 1ec41b6
commit 00cd483
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Allow `Builder` to create links for resource libraries even when no Java classes are built
+ * Fix `Loader.cacheResource()` creating a subdirectory named "null" when caching a top-level file
  * Update `README.md` with reference to newly published [Mapping Recipes for C/C++ Libraries](https://github.com/bytedeco/javacpp/wiki/Mapping-Recipes)
  * Make `Parser` strip annotations from setter methods for basic containers to satisfy the `Generator`
  * Have `Parser` wrap the `insert()` and `erase()` methods of basic containers to allow modifying lists and sets

diff --git a/src/main/java/org/bytedeco/javacpp/Loader.java b/src/main/java/org/bytedeco/javacpp/Loader.java
@@ -392,7 +392,12 @@ public static File cacheResource(URL resourceURL, String target) throws IOExcept
             size = jarEntry.getSize();
             timestamp = jarEntry.getTime();
             if (!noSubdir) {
-                cacheSubdir = new File(cacheSubdir, jarFileFile.getName() + File.separator + jarEntryFile.getParent());
+                String subdirName = jarFileFile.getName();
+                String parentName = jarEntryFile.getParent();
+                if (parentName != null) {
+                    subdirName = subdirName + File.separator + parentName;
+                }
+                cacheSubdir = new File(cacheSubdir, subdirName);
             }
         } else {
             size = urlFile.length();

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Builder.java b/src/main/java/org/bytedeco/javacpp/tools/Builder.java
@@ -843,6 +843,9 @@ public File[] build() throws IOException, InterruptedException, ParserException
                     libs.addAll(libProperties.get("platform.preload"));
                     libs.addAll(libProperties.get("platform.link"));
                 }
+                if (libProperties == null) {
+                    libProperties = new ClassProperties(properties);
+                }
 
                 // Extract the required resources.
                 for (String s : resources.split(separator)) {
@@ -864,7 +867,7 @@ public File[] build() throws IOException, InterruptedException, ParserException
                             }
                         }
                         File[] files = f.listFiles();
-                        if (files != null && libProperties != null) {
+                        if (files != null) {
                             for (File file : files) {
                                 Loader.createLibraryLink(file.getAbsolutePath(), libProperties, null,
                                         linkPaths.toArray(new String[linkPaths.size()]));