X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=88036dae82e471eee78f7f71938bc598467ddbb8;hb=177b83d97d5f533ed7b3f1a2b1670789d467c3dc;hp=67fcc37f953075ca87acd909ace70647b423a5c5;hpb=0faeff39324667f2339cd545997903c3876e481d;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index 67fcc37..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; @@ -77,6 +78,18 @@ public class Make { */ private final static String ENV_ARGEO_BUILD_CONFIG = "ARGEO_BUILD_CONFIG"; + /** Make file variable (in {@link #SDK_MK}) with a path to the sources base. */ + private final static String VAR_SDK_SRC_BASE = "SDK_SRC_BASE"; + + /** + * Make file variable (in {@link #SDK_MK}) with a path to the build output base. + */ + private final static String VAR_SDK_BUILD_BASE = "SDK_BUILD_BASE"; + /** + * Make file variable (in {@link #BRANCH_MK}) with the branch. + */ + private final static String VAR_BRANCH = "BRANCH"; + /** Name of the local-specific Makefile (sdk.mk). */ final static String SDK_MK = "sdk.mk"; /** Name of the branch definition Makefile (branch.mk). */ @@ -97,7 +110,7 @@ public class Make { final Path buildBase; /** The base of the a2 output for all layers. */ final Path a2Output; - /** The base of the a2 sources when packages separately. */ + /** The base of the a2 sources when packaged separately. */ final Path a2srcOutput; /** Whether sources should be packaged separately. */ @@ -118,8 +131,8 @@ public class Make { Path sdkMkP = findSdkMk(execDirectory); Objects.requireNonNull(sdkMkP, "No " + SDK_MK + " found under " + execDirectory); - Map context = readeMakefileVariables(sdkMkP); - sdkSrcBase = Paths.get(context.computeIfAbsent("SDK_SRC_BASE", (key) -> { + Map context = readMakefileVariables(sdkMkP); + sdkSrcBase = Paths.get(context.computeIfAbsent(VAR_SDK_SRC_BASE, (key) -> { throw new IllegalStateException(key + " not found"); })).toAbsolutePath(); @@ -136,7 +149,7 @@ public class Make { } argeoBuildBase = argeoBuildBaseT; - sdkBuildBase = Paths.get(context.computeIfAbsent("SDK_BUILD_BASE", (key) -> { + sdkBuildBase = Paths.get(context.computeIfAbsent(VAR_SDK_BUILD_BASE, (key) -> { throw new IllegalStateException(key + " not found"); })).toAbsolutePath(); buildBase = sdkBuildBase.resolve(sdkSrcBase.getFileName()); @@ -184,8 +197,8 @@ public class Make { if (!Files.exists(a2Dir)) continue categories; // modulePath.add(a2Dir.toString()); - for (Path jarP : Files.newDirectoryStream(a2Dir, - (p) -> p.getFileName().toString().endsWith(".jar"))) { + for (Path jarP : Files.newDirectoryStream(a2Dir, (p) -> p.getFileName().toString().endsWith(".jar") + && !p.getFileName().toString().endsWith(".src.jar"))) { A2Jar a2Jar = new A2Jar(jarP); if (a2Jars.containsKey(a2Jar.name)) { A2Jar current = a2Jars.get(a2Jar.name); @@ -213,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)) { @@ -224,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"); @@ -258,7 +281,7 @@ public class Make { return; List categories = options.get("--category"); - Objects.requireNonNull(bundles, "--category argument must be set"); + Objects.requireNonNull(categories, "--category argument must be set"); if (categories.size() != 1) throw new IllegalArgumentException("One and only one --category must be specified"); String category = categories.get(0); @@ -266,8 +289,8 @@ public class Make { final String branch; Path branchMk = sdkSrcBase.resolve(BRANCH_MK); if (Files.exists(branchMk)) { - Map branchVariables = readeMakefileVariables(branchMk); - branch = branchVariables.get("BRANCH"); + Map branchVariables = readMakefileVariables(branchMk); + branch = branchVariables.get(VAR_BRANCH); } else { branch = null; } @@ -289,6 +312,88 @@ public class Make { logger.log(INFO, "Packaging took " + duration + " ms"); } + /** Install the bundles. */ + void install(Map> options, boolean uninstall) throws IOException { + // check arguments + List bundles = options.get("--bundles"); + Objects.requireNonNull(bundles, "--bundles argument must be set"); + if (bundles.isEmpty()) + return; + + List categories = options.get("--category"); + Objects.requireNonNull(categories, "--category argument must be set"); + if (categories.size() != 1) + throw new IllegalArgumentException("One and only one --category must be specified"); + String category = categories.get(0); + + List targetDirs = options.get("--target"); + Objects.requireNonNull(targetDirs, "--target argument must be set"); + 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, (uninstall ? "Uninstalling from " : "Installing to ") + targetA2); + + final String branch; + Path branchMk = sdkSrcBase.resolve(BRANCH_MK); + if (Files.exists(branchMk)) { + Map branchVariables = readMakefileVariables(branchMk); + branch = branchVariables.get(VAR_BRANCH); + } else { + throw new IllegalArgumentException(VAR_BRANCH + " variable must be set."); + } + + Properties properties = new Properties(); + Path branchBnd = sdkSrcBase.resolve("sdk/branches/" + branch + ".bnd"); + if (Files.exists(branchBnd)) + try (InputStream in = Files.newInputStream(branchBnd)) { + properties.load(in); + } + String major = properties.getProperty("major"); + Objects.requireNonNull(major, "'major' must be set"); + 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(); + Path a2JarDirectory = bundleParent != null ? a2Output.resolve(bundleParent).resolve(category) + : a2Output.resolve(category); + Path jarP = a2JarDirectory.resolve(bundlePath.getFileName() + "." + major + "." + minor + ".jar"); + + 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()); + } + } + /** Package a single bundle. */ void createBundle(String branch, String bundle, String category) throws IOException { final Path source; @@ -299,6 +404,7 @@ public class Make { } else { source = execDirectory.resolve(bundle); } + Path srcP = source.resolve("src"); Path compiled = buildBase.resolve(bundle); String bundleSymbolicName = source.getFileName().toString(); @@ -384,6 +490,11 @@ public class Make { Files.walkFileTree(source, new SimpleFileVisitor() { @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + // skip output directory if it happens to be within the sources + if (Files.isSameFile(sdkBuildBase, dir)) + return FileVisitResult.SKIP_SUBTREE; + + // skip excluded patterns Path relativeP = source.relativize(dir); for (PathMatcher exclude : excludes) if (exclude.matches(relativeP)) @@ -398,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); @@ -405,54 +520,65 @@ public class Make { } }); - Path srcP = source.resolve("src"); - // 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) { - Path a2srcJarDirectory = bundleParent != null ? a2srcOutput.resolve(bundleParent).resolve(category) - : a2srcOutput.resolve(category); - Files.createDirectories(a2srcJarDirectory); - Path srcJarP = a2srcJarDirectory - .resolve(compiled.getFileName() + "." + major + "." + minor + ".src.jar"); - Manifest srcManifest = new Manifest(); - srcManifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); - srcManifest.getMainAttributes().putValue("Bundle-SymbolicName", bundleSymbolicName + ".src"); - srcManifest.getMainAttributes().putValue("Bundle-Version", - manifest.getMainAttributes().getValue("Bundle-Version").toString()); - srcManifest.getMainAttributes().putValue("Eclipse-SourceBundle", - bundleSymbolicName + ";version=\"" + manifest.getMainAttributes().getValue("Bundle-Version")); - - try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) { - copySourcesToJar(srcP, srcJarOut, ""); - // add legal notices and licenses - for (Path p : listLegalFilesToInclude(source).values()) { - jarOut.putNextEntry(new JarEntry(p.getFileName().toString())); - Files.copy(p, jarOut); - } + if (sourceBundles) {// create separate sources jar + Path a2srcJarDirectory = bundleParent != null ? a2srcOutput.resolve(bundleParent).resolve(category) + : a2srcOutput.resolve(category); + Files.createDirectories(a2srcJarDirectory); + Path srcJarP = a2srcJarDirectory.resolve(compiled.getFileName() + "." + major + "." + minor + ".src.jar"); + Manifest srcManifest = new Manifest(); + srcManifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0"); + srcManifest.getMainAttributes().putValue("Bundle-SymbolicName", bundleSymbolicName + ".src"); + srcManifest.getMainAttributes().putValue("Bundle-Version", + manifest.getMainAttributes().getValue("Bundle-Version").toString()); + srcManifest.getMainAttributes().putValue("Eclipse-SourceBundle", + bundleSymbolicName + ";version=\"" + manifest.getMainAttributes().getValue("Bundle-Version")); + + try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) { + copySourcesToJar(srcP, srcJarOut, ""); + // add legal notices and licenses + for (Path p : listLegalFilesToInclude(source).values()) { + srcJarOut.putNextEntry(new JarEntry(p.getFileName().toString())); + Files.copy(p, srcJarOut); } - } else { - copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/"); } } } @@ -522,7 +648,7 @@ public class Make { * Reads Makefile variable assignments of the form =, :=, or ?=, ignoring white * spaces. To be used with very simple included Makefiles only. */ - Map readeMakefileVariables(Path path) throws IOException { + Map readMakefileVariables(Path path) throws IOException { Map context = new HashMap<>(); List sdkMkLines = Files.readAllLines(path); lines: for (String line : sdkMkLines) { @@ -569,6 +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, false); + case "uninstall" -> argeoMake.install(options, true); default -> throw new IllegalArgumentException("Unkown action: " + action); }