X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=2b6187bcd6d9912d570232e7c40dd0426f5ffa86;hb=981fb47f2abf1587a2b7551310617ce532927472;hp=af624060d66eb9d95d1f26cd518e44442584843d;hpb=72a758a0ed344a5d0845e8bbd3b74d4b9f1b9bb6;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index af62406..2b6187b 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -3,7 +3,6 @@ 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; @@ -39,12 +38,14 @@ import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import java.util.stream.Collectors; import java.util.zip.Deflater; import org.eclipse.jdt.core.compiler.CompilationProgress; import aQute.bnd.osgi.Analyzer; import aQute.bnd.osgi.Jar; +import aQute.bnd.plugin.jpms.JPMSModuleInfoPlugin; /** * Minimalistic OSGi compiler and packager, meant to be used as a single file @@ -176,7 +177,8 @@ public class Make { List a2Categories = options.getOrDefault("--dep-categories", new ArrayList<>()); List a2Bases = options.getOrDefault("--a2-bases", new ArrayList<>()); - if (a2Bases.isEmpty() || !a2Bases.contains(a2Output.toString())) { + a2Bases = a2Bases.stream().distinct().collect(Collectors.toList());// remove duplicates + if (a2Bases.isEmpty() || !a2Bases.contains(a2Output.toString())) {// make sure a2 output is available a2Bases.add(a2Output.toString()); } @@ -205,10 +207,9 @@ public class Make { A2Jar current = a2Jars.get(a2Jar.name); if (a2Jar.major > current.major) a2Jars.put(a2Jar.name, a2Jar); - else if (a2Jar.major == current.major // - // if minor equals, we take the last one - && a2Jar.minor >= current.minor) + else if (a2Jar.major == current.major && a2Jar.minor > current.minor) a2Jars.put(a2Jar.name, a2Jar); + // keep if minor equals } else { a2Jars.put(a2Jar.name, a2Jar); } @@ -241,7 +242,7 @@ public class Make { } Path bundleSrc = bundlePath.resolve("src"); if (!Files.exists(bundleSrc)) { - logger.log(TRACE, bundleSrc + " does not exist, skipping it, as this is not a Java bundle"); + logger.log(WARNING, bundleSrc + " does not exist, skipping it, as this is not a Java bundle"); continue bundles; } sb.append(bundleSrc); @@ -310,29 +311,24 @@ public class Make { } CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join(); long duration = System.currentTimeMillis() - begin; - logger.log(INFO, "Packaging took " + duration + " ms"); + logger.log(DEBUG, "Packaging took " + duration + " ms"); } - /** Install the bundles. */ + /** Install or uninstall bundles and native output. */ void install(Map> options, boolean uninstall) throws IOException { + final String LIB_ = "lib/"; + final String NATIVE_ = "native/"; + // check arguments - List bundles = options.get("--bundles"); - Objects.requireNonNull(bundles, "--bundles argument must be set"); + List bundles = multiArg(options, "--bundles", true); 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); + String category = singleArg(options, "--category", true); + Path targetA2 = Paths.get(singleArg(options, "--target", true)); + String nativeTargetArg = singleArg(options, "--target-native", false); + Path nativeTargetA2 = nativeTargetArg != null ? Paths.get(nativeTargetArg) : null; + String targetOs = singleArg(options, "--os", nativeTargetArg != null); + logger.log(INFO, (uninstall ? "Uninstalling bundles from " : "Installing bundles to ") + targetA2); final String branch; Path branchMk = sdkSrcBase.resolve(BRANCH_MK); @@ -355,14 +351,28 @@ public class Make { Objects.requireNonNull(minor, "'minor' must be set"); int count = 0; - for (String bundle : bundles) { + bundles: 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)); + Path targetJarP; + if (bundle.startsWith(LIB_)) {// OS-specific + Objects.requireNonNull(nativeTargetA2); + if (bundle.startsWith(LIB_ + NATIVE_) // portable native + || bundle.startsWith(LIB_ + targetOs + "/" + NATIVE_)) {// OS-specific native + targetJarP = nativeTargetA2.resolve(category).resolve(jarP.getFileName()); + } else if (bundle.startsWith(LIB_ + targetOs)) {// OS-specific portable + targetJarP = targetA2.resolve(category).resolve(jarP.getFileName()); + } else { // ignore other OS + continue bundles; + } + } else { + targetJarP = targetA2.resolve(a2Output.relativize(jarP)); + } + if (uninstall) { // uninstall if (Files.exists(targetJarP)) { Files.delete(targetJarP); @@ -370,7 +380,10 @@ public class Make { count++; } Path targetParent = targetJarP.getParent(); - deleteEmptyParents(targetA2, targetParent); + if (targetParent.startsWith(targetA2)) + deleteEmptyParents(targetA2, targetParent); + if (nativeTargetA2 != null && targetParent.startsWith(nativeTargetA2)) + deleteEmptyParents(nativeTargetA2, targetParent); } else { // install Files.createDirectories(targetJarP.getParent()); boolean update = Files.exists(targetJarP); @@ -382,33 +395,62 @@ public class Make { 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 { + /** Extracts an argument which must be unique. */ + String singleArg(Map> options, String arg, boolean mandatory) { + List values = options.get(arg); + if (values == null || values.size() == 0) + if (mandatory) + throw new IllegalArgumentException(arg + " argument must be set"); + else + return null; + if (values.size() != 1) + throw new IllegalArgumentException("One and only one " + arg + " arguments must be specified"); + return values.get(0); + } + + /** Extracts an argument which can have multiple values. */ + List multiArg(Map> options, String arg, boolean mandatory) { + List values = options.get(arg); + if (mandatory && values == null) + throw new IllegalArgumentException(arg + " argument must be set"); + return values != null ? values : new ArrayList<>(); + } + + /** Delete empty parent directory up to the base directory (included). */ + void deleteEmptyParents(Path baseDir, Path targetParent) throws IOException { + if (!targetParent.startsWith(baseDir)) + throw new IllegalArgumentException(targetParent + " does not start with " + baseDir); + if (!Files.exists(baseDir)) + return; + if (!Files.exists(targetParent)) { + deleteEmptyParents(baseDir, targetParent.getParent()); + return; + } if (!Files.isDirectory(targetParent)) throw new IllegalArgumentException(targetParent + " must be a directory"); - boolean isA2target = Files.isSameFile(targetA2, targetParent); + boolean isA2target = Files.isSameFile(baseDir, targetParent); if (!Files.list(targetParent).iterator().hasNext()) { Files.delete(targetParent); if (isA2target) return;// stop after deleting A2 base - deleteEmptyParents(targetA2, targetParent.getParent()); + deleteEmptyParents(baseDir, targetParent.getParent()); } } /** Package a single bundle. */ void createBundle(String branch, String bundle, String category) throws IOException { - final Path source; + final Path bundleSourceBase; if (!Files.exists(execDirectory.resolve(bundle))) { logger.log(WARNING, "Bundle " + bundle + " not found in " + execDirectory + ", assuming this is this directory."); - source = execDirectory; + bundleSourceBase = execDirectory; } else { - source = execDirectory.resolve(bundle); + bundleSourceBase = execDirectory.resolve(bundle); } - Path srcP = source.resolve("src"); + Path srcP = bundleSourceBase.resolve("src"); Path compiled = buildBase.resolve(bundle); - String bundleSymbolicName = source.getFileName().toString(); + String bundleSymbolicName = bundleSourceBase.getFileName().toString(); // Metadata Properties properties = new Properties(); @@ -425,7 +467,7 @@ public class Make { } } - Path bndBnd = source.resolve("bnd.bnd"); + Path bndBnd = bundleSourceBase.resolve("bnd.bnd"); if (Files.exists(bndBnd)) try (InputStream in = Files.newInputStream(bndBnd)) { properties.load(in); @@ -445,6 +487,9 @@ public class Make { Jar jar = new Jar(bundleSymbolicName, binP.toFile()); bndAnalyzer.setJar(jar); manifest = bndAnalyzer.calcManifest(); + + JPMSModuleInfoPlugin jpmsModuleInfoPlugin = new JPMSModuleInfoPlugin(); + jpmsModuleInfoPlugin.verify(bndAnalyzer); } catch (Exception e) { throw new RuntimeException("Bnd analysis of " + compiled + " failed", e); } @@ -488,7 +533,7 @@ public class Make { }); // add resources - Files.walkFileTree(source, new SimpleFileVisitor() { + Files.walkFileTree(bundleSourceBase, new SimpleFileVisitor() { @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { // skip output directory if it happens to be within the sources @@ -496,7 +541,7 @@ public class Make { return FileVisitResult.SKIP_SUBTREE; // skip excluded patterns - Path relativeP = source.relativize(dir); + Path relativeP = bundleSourceBase.relativize(dir); for (PathMatcher exclude : excludes) if (exclude.matches(relativeP)) return FileVisitResult.SKIP_SUBTREE; @@ -506,10 +551,14 @@ public class Make { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - Path relativeP = source.relativize(file); + Path relativeP = bundleSourceBase.relativize(file); for (PathMatcher exclude : excludes) if (exclude.matches(relativeP)) return FileVisitResult.CONTINUE; + // skip JavaScript source maps + if (sourceBundles && file.getFileName().toString().endsWith(".map")) + return FileVisitResult.CONTINUE; + JarEntry entry = new JarEntry(relativeP.toString()); jarOut.putNextEntry(entry); Files.copy(file, jarOut); @@ -517,41 +566,43 @@ public class Make { } }); - // 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); - } + 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")) + @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()) { + for (Path p : listLegalFilesToInclude(bundleSourceBase).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 @@ -559,22 +610,49 @@ public class Make { : 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()); + createSourceBundle(bundleSymbolicName, manifest, bundleSourceBase, srcP, srcJarP); + } + } + + /** Create a separate bundle containing the sources. */ + void createSourceBundle(String bundleSymbolicName, Manifest manifest, Path bundleSourceBase, Path srcP, + Path srcJarP) throws IOException { + 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()); + + boolean isJsBundle = bundleSymbolicName.endsWith(".js"); + if (!isJsBundle) { 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()) { + for (Path p : listLegalFilesToInclude(bundleSourceBase).values()) { srcJarOut.putNextEntry(new JarEntry(p.getFileName().toString())); Files.copy(p, srcJarOut); } } + } else {// JavaScript source maps + srcManifest.getMainAttributes().putValue("Fragment-Host", bundleSymbolicName + ";bundle-version=\"" + + manifest.getMainAttributes().getValue("Bundle-Version")); + try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) { + Files.walkFileTree(bundleSourceBase, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Path relativeP = bundleSourceBase.relativize(file); + if (!file.getFileName().toString().endsWith(".map")) + return FileVisitResult.CONTINUE; + JarEntry entry = new JarEntry(relativeP.toString()); + srcJarOut.putNextEntry(entry); + Files.copy(file, srcJarOut); + return FileVisitResult.CONTINUE; + } + }); + } } } @@ -697,8 +775,8 @@ public class Make { } long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); - logger.log(INFO, "Make.java action '" + action + "' succesfully completed after " + (jvmUptime / 1000) + "." - + (jvmUptime % 1000) + " s"); + logger.log(INFO, "Make.java action '" + action + "' successfully completed after " + (jvmUptime / 1000) + + "." + (jvmUptime % 1000) + " s"); } catch (Exception e) { long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); logger.log(ERROR, "Make.java action '" + action + "' failed after " + (jvmUptime / 1000) + "."