From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 May 2023 09:31:05 +0000 (+0200)
Subject: Introduce osgi-uninstall
X-Git-Tag: v2.3.6~8
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=6672d3a2c0528a33b5e25539b9acbb73ce0e495c;p=cc0%2Fargeo-build.git

Introduce osgi-uninstall
---

diff --git a/osgi.mk b/osgi.mk
index 8200ece..7b92dd8 100644
--- a/osgi.mk
+++ b/osgi.mk
@@ -81,6 +81,11 @@ osgi-install:
 	 install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
 	 --target $(DESTDIR)$(A2_INSTALL_TARGET)
 
+osgi-uninstall:
+	$(ARGEO_MAKE) \
+	 uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
+	 --target $(DESTDIR)$(A2_INSTALL_TARGET)
+
 # Javadoc generation
 javadoc: $(BUILD_BASE)/built
 	$(JAVADOC) -noindex -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 7415006..a9676f8 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -302,7 +302,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 +320,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, "Installing to " + targetA2);
+		logger.log(INFO, (uninstall ? "Uninstalling from " : "Installing to ") + targetA2);
 
 		final String branch;
 		Path branchMk = sdkSrcBase.resolve(BRANCH_MK);
@@ -342,6 +342,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,10 +350,21 @@ 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++;
+				}
+			} else { // install
+				Files.createDirectories(targetJarP.getParent());
+				boolean update = Files.exists(targetJarP);
+				Files.copy(jarP, targetJarP);
+				logger.log(DEBUG, (update ? "Updated " : "Installed ") + targetJarP);
+			}
 		}
+		logger.log(INFO, uninstall ? count + " bundles removed" : count + " bundles installed or updated");
 	}
 
 	/** Package a single bundle. */
@@ -641,7 +653,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);
 			}