Skip *.js source directories

[cc0/argeo-build.git] / src / org / argeo / build / Make.java

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 9c57abe15c47e604005e70752c6c0e23c76ac7ed..cfedf9a06912e5a74fcc4fd1ccd30315c5f81940 100644 (file)
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -508,15 +508,20 @@ public class Make {
 
                        // Add all resources from src/
                        Files.walkFileTree(srcP, new SimpleFileVisitor<Path>() {
+                               @Override
+                               public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+                                       // skip directories ending with .js
+                                       // TODO find something more robust?
+                                       if (dir.getFileName().toString().endsWith(".js"))
+                                               return FileVisitResult.SKIP_SUBTREE;
+                                       return super.preVisitDirectory(dir, attrs);
+                               }
+
                                @Override
                                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
                                        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);