X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=cfedf9a06912e5a74fcc4fd1ccd30315c5f81940;hb=4d2955f554f19e8f77eae527b5831d533eb8d27f;hp=9c57abe15c47e604005e70752c6c0e23c76ac7ed;hpb=c3db42061f64ac832ef7b9a86b01b6f1b04c2601;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 9c57abe..cfedf9a 100644
--- 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);