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

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 7eda0ab..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;
@@ -302,7 +303,7 @@ public class Make {
 	}
 
 	/** Install the bundles. */
-	void install(Map<String, List<String>> options) throws IOException {
+	void install(Map<String, List<String>> options, boolean uninstall) throws IOException {
 		// check arguments
 		List<String> bundles = options.get("--bundles");
 		Objects.requireNonNull(bundles, "--bundles argument must be set");
@@ -320,7 +321,7 @@ public class Make {
 		if (targetDirs.size() != 1)
 			throw new IllegalArgumentException("One and only one --target must be specified");
 		Path targetA2 = Paths.get(targetDirs.get(0));
-		logger.log(INFO, "Intsalling to " + targetA2 + " ms");
+		logger.log(INFO, (uninstall ? "Uninstalling from " : "Installing to ") + targetA2);
 
 		final String branch;
 		Path branchMk = sdkSrcBase.resolve(BRANCH_MK);
@@ -342,6 +343,7 @@ public class Make {
 		String minor = properties.getProperty("minor");
 		Objects.requireNonNull(minor, "'minor' must be set");
 
+		int count = 0;
 		for (String bundle : bundles) {
 			Path bundlePath = Paths.get(bundle);
 			Path bundleParent = bundlePath.getParent();
@@ -349,9 +351,36 @@ public class Make {
 					: a2Output.resolve(category);
 			Path jarP = a2JarDirectory.resolve(bundlePath.getFileName() + "." + major + "." + minor + ".jar");
 
-			Path targetJarP = targetA2.resolve(a2JarDirectory.relativize(jarP));
-			Files.createDirectories(targetJarP.getParent());
-			Files.copy(jarP, targetJarP);
+			Path targetJarP = targetA2.resolve(a2Output.relativize(jarP));
+			if (uninstall) { // uninstall
+				if (Files.exists(targetJarP)) {
+					Files.delete(targetJarP);
+					logger.log(DEBUG, "Removed " + targetJarP);
+					count++;
+				}
+				Path targetParent = targetJarP.getParent();
+				deleteEmptyParents(targetA2, targetParent);
+			} else { // install
+				Files.createDirectories(targetJarP.getParent());
+				boolean update = Files.exists(targetJarP);
+				Files.copy(jarP, targetJarP, StandardCopyOption.REPLACE_EXISTING);
+				logger.log(DEBUG, (update ? "Updated " : "Installed ") + targetJarP);
+				count++;
+			}
+		}
+		logger.log(INFO, uninstall ? count + " bundles removed" : count + " bundles installed or updated");
+	}
+
+	/** Delete empty parent directory up to the A2 target (included). */
+	void deleteEmptyParents(Path targetA2, Path targetParent) throws IOException {
+		if (!Files.isDirectory(targetParent))
+			throw new IllegalArgumentException(targetParent + " must be a directory");
+		boolean isA2target = Files.isSameFile(targetA2, targetParent);
+		if (!Files.list(targetParent).iterator().hasNext()) {
+			Files.delete(targetParent);
+			if (isA2target)
+				return;// stop after deleting A2 base
+			deleteEmptyParents(targetA2, targetParent.getParent());
 		}
 	}
 
@@ -489,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
@@ -641,7 +680,8 @@ public class Make {
 			case "compile" -> argeoMake.compile(options);
 			case "bundle" -> argeoMake.bundle(options);
 			case "all" -> argeoMake.all(options);
-			case "install" -> argeoMake.install(options);
+			case "install" -> argeoMake.install(options, false);
+			case "uninstall" -> argeoMake.install(options, true);
 
 			default -> throw new IllegalArgumentException("Unkown action: " + action);
 			}