From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 29 Aug 2023 08:17:21 +0000 (+0200)
Subject: Skip *.js source directories
X-Git-Tag: v2.3.8~27
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=199fe0d1ffe514f49629b64dd0c7669da752beae

Skip *.js source directories
---

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