X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=88036dae82e471eee78f7f71938bc598467ddbb8;hb=177b83d97d5f533ed7b3f1a2b1670789d467c3dc;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..88036da 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; @@ -225,7 +226,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 +238,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 +313,7 @@ public class Make { } /** Install the bundles. */ - void install(Map> options) throws IOException { + void install(Map> options, boolean uninstall) throws IOException { // check arguments List bundles = options.get("--bundles"); Objects.requireNonNull(bundles, "--bundles argument must be set"); @@ -320,7 +331,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 +353,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 +361,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()); } } @@ -470,6 +509,10 @@ public class Make { for (PathMatcher exclude : excludes) if (exclude.matches(relativeP)) return FileVisitResult.CONTINUE; + // skip JavaScript source maps + if (file.getFileName().toString().endsWith(".map")) + return FileVisitResult.CONTINUE; + JarEntry entry = new JarEntry(relativeP.toString()); jarOut.putNextEntry(entry); Files.copy(file, jarOut); @@ -477,32 +520,43 @@ public class Make { } }); - // Add all resources from src/ - Files.walkFileTree(srcP, new SimpleFileVisitor() { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - if (file.getFileName().toString().endsWith(".java") - || file.getFileName().toString().endsWith(".class")) + if (Files.exists(srcP)) { + // Add all resources from src/ + Files.walkFileTree(srcP, new SimpleFileVisitor() { + @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") + || file.getFileName().toString().endsWith(".class")) + return FileVisitResult.CONTINUE; + jarOut.putNextEntry(new JarEntry(srcP.relativize(file).toString())); + if (!Files.isDirectory(file)) + Files.copy(file, jarOut); return FileVisitResult.CONTINUE; - jarOut.putNextEntry(new JarEntry(srcP.relativize(file).toString())); - if (!Files.isDirectory(file)) - Files.copy(file, jarOut); - return FileVisitResult.CONTINUE; + } + }); + + // add sources + // TODO add effective BND, Eclipse project file, etc., in order to be able to + // repackage + if (!sourceBundles) { + copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/"); } - }); + } // add legal notices and licenses for (Path p : listLegalFilesToInclude(source).values()) { jarOut.putNextEntry(new JarEntry(p.getFileName().toString())); Files.copy(p, jarOut); } - - // add sources - // TODO add effective BND, Eclipse project file, etc., in order to be able to - // repackage - if (!sourceBundles) { - copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/"); - } } if (sourceBundles) {// create separate sources jar @@ -641,7 +695,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); }