X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=8e872dcb61af818ea71946b4369197eaf6e7ddc4;hb=199fe0d1ffe514f49629b64dd0c7669da752beae;hp=9b06aa8c2105749e9c033f4a9fda5f1503a53675;hpb=e3f07f8af74d9a29be82bd5b35020b4cee8d5ce7;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 9b06aa8..8e872dc 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -20,6 +20,7 @@ import java.nio.file.Path;
 import java.nio.file.PathMatcher;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -362,7 +363,7 @@ public class Make {
 			} else { // install
 				Files.createDirectories(targetJarP.getParent());
 				boolean update = Files.exists(targetJarP);
-				Files.copy(jarP, targetJarP);
+				Files.copy(jarP, targetJarP, StandardCopyOption.REPLACE_EXISTING);
 				logger.log(DEBUG, (update ? "Updated " : "Installed ") + targetJarP);
 				count++;
 			}
@@ -517,6 +518,16 @@ public class Make {
 						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