Skip *.js source directories

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 9c57abe15c47e604005e70752c6c0e23c76ac7ed..8e872dcb61af818ea71946b4369197eaf6e7ddc4 100644 (file)
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -513,15 +513,21 @@ public class Make {
                                        if (file.getFileName().toString().endsWith(".java")
                                                        || file.getFileName().toString().endsWith(".class"))
                                                return FileVisitResult.CONTINUE;
-                                       // skip directories ending with .js
-                                       // TODO find something more robust?
-                                       if (Files.isDirectory(file) && file.getFileName().endsWith(".js"))
-                                               return FileVisitResult.SKIP_SUBTREE;
                                        jarOut.putNextEntry(new JarEntry(srcP.relativize(file).toString()));
                                        if (!Files.isDirectory(file))
                                                Files.copy(file, jarOut);
                                        return FileVisitResult.CONTINUE;
                                }
+
+                               @Override
+                               public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                                       // skip directories ending with .js
+                                       // TODO find something more robust?
+                                       if (dir.getFileName().endsWith(".js"))
+                                               return FileVisitResult.SKIP_SUBTREE;
+                                       return super.preVisitDirectory(dir, attrs);
+                               }
+
                        });
 
                        // add legal notices and licenses