Do not compile bundles without sources

[cc0/argeo-build.git] / src / org / argeo / build / Make.java

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 741500602766d264d6d63272e84c4075daf5c50b..ca5fc8e09e5434bef3db05857de9674a23287fae 100644 (file)
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -3,6 +3,7 @@ package org.argeo.build;
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.ERROR;
 import static java.lang.System.Logger.Level.INFO;
+import static java.lang.System.Logger.Level.TRACE;
 import static java.lang.System.Logger.Level.WARNING;
 
 import java.io.File;
@@ -20,6 +21,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;
@@ -225,7 +227,8 @@ public class Make {
                }
 
                // sources
-               for (String bundle : bundles) {
+               boolean atLeastOneBundleToCompile = false;
+               bundles: for (String bundle : bundles) {
                        StringBuilder sb = new StringBuilder();
                        Path bundlePath = execDirectory.resolve(bundle);
                        if (!Files.exists(bundlePath)) {
@@ -236,15 +239,24 @@ public class Make {
                                } else
                                        throw new IllegalArgumentException("Bundle " + bundle + " not found in " + execDirectory);
                        }
-                       sb.append(bundlePath.resolve("src"));
+                       Path bundleSrc = bundlePath.resolve("src");
+                       if (!Files.exists(bundleSrc)) {
+                               logger.log(WARNING, bundleSrc + " does not exist, skipping it, as this is not a Java bundle");
+                               continue bundles;
+                       }
+                       sb.append(bundleSrc);
                        sb.append("[-d");
                        compilerArgs.add(sb.toString());
                        sb = new StringBuilder();
                        sb.append(buildBase.resolve(bundle).resolve("bin"));
                        sb.append("]");
                        compilerArgs.add(sb.toString());
+                       atLeastOneBundleToCompile = true;
                }
 
+               if (!atLeastOneBundleToCompile)
+                       return;
+
                if (logger.isLoggable(INFO))
                        compilerArgs.add("-time");
 
@@ -302,7 +314,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 +332,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 +354,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 +362,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());
                }
        }
 
@@ -479,6 +519,15 @@ 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")
@@ -641,7 +690,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);
                        }