X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=d94cb02069e42d166339fb700d1a482828e80e67;hb=e7090f399609f0c1c80729e426c2463efed7e9cc;hp=6a6e2b09aefc12369c301bd2201aa79c305190fe;hpb=f70fb0cadfc300440717fc03ccecae11b07d99f9;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index 6a6e2b0..d94cb02 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -1,10 +1,15 @@ package org.argeo.build; +import static java.lang.System.Logger.Level.ERROR; +import static java.lang.System.Logger.Level.INFO; + import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; +import java.lang.System.Logger; +import java.lang.System.Logger.Level; import java.lang.management.ManagementFactory; import java.nio.file.FileVisitResult; import java.nio.file.Files; @@ -22,6 +27,7 @@ import java.util.Objects; import java.util.Properties; import java.util.StringJoiner; import java.util.StringTokenizer; +import java.util.concurrent.CompletableFuture; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; @@ -31,16 +37,38 @@ import org.eclipse.jdt.core.compiler.CompilationProgress; import aQute.bnd.osgi.Analyzer; import aQute.bnd.osgi.Jar; +/** + * Minimalistic OSGi compiler and packager, meant to be used as a single file + * without being itself compiled first. It depends on the Eclipse batch compiler + * (aka. ECJ) and the BND Libs library for OSGi metadata generation (which + * itselfs depends on slf4j).
+ *
+ * For example, a typical system call would be:
+ * java -cp "/path/to/ECJ jar:/path/to/bndlib jar:/path/to/SLF4J jar" /path/to/cloned/argeo-build/src/org/argeo/build/Make.java action --option1 argument1 argument2 --option2 argument3 + */ public class Make { - private final static String SDK_MK = "sdk.mk"; + private final static Logger logger = System.getLogger(Make.class.getName()); + + /** Name of the local-specific Makefile (sdk.mk). */ + final static String SDK_MK = "sdk.mk"; + /** The execution directory (${user.dir}). */ final Path execDirectory; + /** Base of the source code, typically the cloned git repository. */ final Path sdkSrcBase; + /** + * The base of the builder, typically a submodule pointing to the public + * argeo-build directory. + */ final Path argeoBuildBase; + /** The base of the build for all layers. */ final Path sdkBuildBase; + /** The base of the build for this layer. */ final Path buildBase; + /** The base of the a2 output for all layers. */ final Path a2Output; + /** Constructor initialises the base directories. */ public Make() throws IOException { execDirectory = Paths.get(System.getProperty("user.dir")); Path sdkMkP = findSdkMk(execDirectory); @@ -74,22 +102,13 @@ public class Make { /* * ACTIONS */ - + /** Compile and create the bundles in one go. */ void all(Map> options) throws IOException { -// List a2Bundles = options.get("--a2-bundles"); -// if (a2Bundles == null) -// throw new IllegalArgumentException("--a2-bundles must be specified"); -// List bundles = new ArrayList<>(); -// for (String a2Bundle : a2Bundles) { -// Path a2BundleP = Paths.get(a2Bundle); -// Path bundleP = a2Output.relativize(a2BundleP.getParent().getParent().resolve(a2BundleP.getFileName())); -// bundles.add(bundleP.toString()); -// } -// options.put("--bundles", bundles); compile(options); bundle(options); } + /** Compile all the bundles which have been passed via the --bundle argument. */ @SuppressWarnings("restriction") void compile(Map> options) throws IOException { List bundles = options.get("--bundles"); @@ -110,26 +129,34 @@ public class Make { // classpath if (!a2Categories.isEmpty()) { - compilerArgs.add("-cp"); StringJoiner classPath = new StringJoiner(File.pathSeparator); + StringJoiner modulePath = new StringJoiner(File.pathSeparator); for (String a2Base : a2Bases) { for (String a2Category : a2Categories) { Path a2Dir = Paths.get(a2Base).resolve(a2Category); if (!Files.exists(a2Dir)) Files.createDirectories(a2Dir); + modulePath.add(a2Dir.toString()); for (Path jarP : Files.newDirectoryStream(a2Dir, (p) -> p.getFileName().toString().endsWith(".jar"))) { classPath.add(jarP.toString()); + System.out.println(jarP); } } } + compilerArgs.add("-cp"); compilerArgs.add(classPath.toString()); +// compilerArgs.add("--module-path"); +// compilerArgs.add(modulePath.toString()); } // sources for (String bundle : bundles) { StringBuilder sb = new StringBuilder(); - sb.append(execDirectory.resolve(bundle).resolve("src")); + Path bundlePath = execDirectory.resolve(bundle); + if (!Files.exists(bundlePath)) + throw new IllegalArgumentException("Bundle " + bundle + " not found in " + execDirectory); + sb.append(bundlePath.resolve("src")); sb.append("[-d"); compilerArgs.add(sb.toString()); sb = new StringBuilder(); @@ -138,81 +165,60 @@ public class Make { compilerArgs.add(sb.toString()); } - // System.out.println(compilerArgs); - - CompilationProgress compilationProgress = new CompilationProgress() { - int totalWork; - long currentChunk = 0; - - long chunksCount = 80; - - @Override - public void worked(int workIncrement, int remainingWork) { - long chunk = ((totalWork - remainingWork) * chunksCount) / totalWork; - if (chunk != currentChunk) { - currentChunk = chunk; - for (long i = 0; i < currentChunk; i++) { - System.out.print("#"); - } - for (long i = currentChunk; i < chunksCount; i++) { - System.out.print("-"); - } - System.out.print("\r"); - } - if (remainingWork == 0) - System.out.print("\n"); - } - - @Override - public void setTaskName(String name) { - } - - @Override - public boolean isCanceled() { - return false; - } + if (logger.isLoggable(INFO)) + compilerArgs.add("-time"); - @Override - public void done() { - } +// for (String arg : compilerArgs) +// System.out.println(arg); - @Override - public void begin(int remainingWork) { - this.totalWork = remainingWork; - } - }; - // Use Main instead of BatchCompiler to workaround the fact that - // org.eclipse.jdt.core.compiler.batch is not exported - boolean success = org.eclipse.jdt.internal.compiler.batch.Main.compile( + boolean success = org.eclipse.jdt.core.compiler.batch.BatchCompiler.compile( compilerArgs.toArray(new String[compilerArgs.size()]), new PrintWriter(System.out), - new PrintWriter(System.err), (CompilationProgress) compilationProgress); - if (!success) { - System.exit(1); - } + new PrintWriter(System.err), new MakeCompilationProgress()); + if (!success) // kill the process if compilation failed + throw new IllegalStateException("Compilation failed"); } - void bundle(Map> options) throws IOException { + /** Package the bundles. */ + void bundle(Map> options) { + // 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(bundles, "--bundles argument must be set"); + Objects.requireNonNull(bundles, "--category argument must be set"); if (categories.size() != 1) - throw new IllegalArgumentException("One and only one category must be specified"); + throw new IllegalArgumentException("One and only one --category must be specified"); String category = categories.get(0); - // create jars + List branches = options.get("--branch"); + if (branches.size() != 1) + throw new IllegalArgumentException("One and only one --branch must be specified"); + String branch = branches.get(0); + + long begin = System.currentTimeMillis(); + // create jars in parallel + List> toDos = new ArrayList<>(); for (String bundle : bundles) { - createBundle(bundle, category); + toDos.add(CompletableFuture.runAsync(() -> { + try { + createBundle(branch, bundle, category); + } catch (IOException e) { + throw new RuntimeException("Packaging of " + bundle + " failed", e); + } + })); } + CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join(); + long duration = System.currentTimeMillis() - begin; + logger.log(INFO, "Packaging took " + duration + " ms"); } /* - * JAR PACKAGING + * UTILITIES */ - void createBundle(String bundle, String category) throws IOException { + /** Package a single bundle. */ + void createBundle(String branch, String bundle, String category) throws IOException { Path source = execDirectory.resolve(bundle); Path compiled = buildBase.resolve(bundle); String bundleSymbolicName = source.getFileName().toString(); @@ -223,8 +229,8 @@ public class Make { try (InputStream in = Files.newInputStream(argeoBnd)) { properties.load(in); } - // FIXME make it configurable - Path branchBnd = sdkSrcBase.resolve("cnf/unstable.bnd"); + + Path branchBnd = sdkSrcBase.resolve("sdk/branches/" + branch + ".bnd"); try (InputStream in = Files.newInputStream(branchBnd)) { properties.load(in); } @@ -247,18 +253,14 @@ public class Make { Jar jar = new Jar(bundleSymbolicName, binP.toFile()); bndAnalyzer.setJar(jar); manifest = bndAnalyzer.calcManifest(); - -// keys: for (Object key : manifest.getMainAttributes().keySet()) { -// System.out.println(key + ": " + manifest.getMainAttributes().getValue(key.toString())); -// } } catch (Exception e) { throw new RuntimeException("Bnd analysis of " + compiled + " failed", e); } - String major = properties.getProperty("MAJOR"); - Objects.requireNonNull(major, "MAJOR must be set"); - String minor = properties.getProperty("MINOR"); - Objects.requireNonNull(minor, "MINOR must be set"); + String major = properties.getProperty("major"); + Objects.requireNonNull(major, "'major' must be set"); + String minor = properties.getProperty("minor"); + Objects.requireNonNull(minor, "'minor' must be set"); // Write manifest Path manifestP = compiled.resolve("META-INF/MANIFEST.MF"); @@ -266,17 +268,6 @@ public class Make { try (OutputStream out = Files.newOutputStream(manifestP)) { manifest.write(out); } -// -// // Load manifest -// Path manifestP = compiled.resolve("META-INF/MANIFEST.MF"); -// if (!Files.exists(manifestP)) -// throw new IllegalStateException("Manifest " + manifestP + " not found"); -// Manifest manifest; -// try (InputStream in = Files.newInputStream(manifestP)) { -// manifest = new Manifest(in); -// } catch (IOException e) { -// throw new IllegalStateException("Cannot read manifest " + manifestP, e); -// } // Load excludes List excludes = new ArrayList<>(); @@ -294,9 +285,7 @@ public class Make { try (JarOutputStream jarOut = new JarOutputStream(Files.newOutputStream(jarP), manifest)) { // add all classes first -// Path binP = compiled.resolve("bin"); Files.walkFileTree(binP, new SimpleFileVisitor() { - @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { jarOut.putNextEntry(new JarEntry(binP.relativize(file).toString())); @@ -307,7 +296,6 @@ public class Make { // add resources Files.walkFileTree(source, new SimpleFileVisitor() { - @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { Path relativeP = source.relativize(dir); @@ -329,7 +317,6 @@ public class Make { Files.copy(file, jarOut); return FileVisitResult.CONTINUE; } - }); // add sources @@ -337,19 +324,21 @@ public class Make { // repackage Path srcP = source.resolve("src"); Files.walkFileTree(srcP, new SimpleFileVisitor() { - @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { jarOut.putNextEntry(new JarEntry("OSGI-OPT/src/" + srcP.relativize(file).toString())); - Files.copy(file, jarOut); + if (!Files.isDirectory(file)) + Files.copy(file, jarOut); return FileVisitResult.CONTINUE; } }); - } - } + /** + * Recursively find the base source directory (which contains the + * {@value #SDK_MK} file). + */ private Path findSdkMk(Path directory) { Path sdkMkP = directory.resolve(SDK_MK); if (Files.exists(sdkMkP)) { @@ -358,32 +347,32 @@ public class Make { if (directory.getParent() == null) return null; return findSdkMk(directory.getParent()); - } + /** Main entry point, interpreting actions and arguments. */ public static void main(String... args) { - try { - if (args.length == 0) - throw new IllegalArgumentException("At least an action must be provided"); - int actionIndex = 0; - String action = args[actionIndex]; - if (args.length > actionIndex + 1 && !args[actionIndex + 1].startsWith("-")) - throw new IllegalArgumentException( - "Action " + action + " must be followed by an option: " + Arrays.asList(args)); - - Map> options = new HashMap<>(); - String currentOption = null; - for (int i = actionIndex + 1; i < args.length; i++) { - if (args[i].startsWith("-")) { - currentOption = args[i]; - if (!options.containsKey(currentOption)) - options.put(currentOption, new ArrayList<>()); - - } else { - options.get(currentOption).add(args[i]); - } + if (args.length == 0) + throw new IllegalArgumentException("At least an action must be provided"); + int actionIndex = 0; + String action = args[actionIndex]; + if (args.length > actionIndex + 1 && !args[actionIndex + 1].startsWith("-")) + throw new IllegalArgumentException( + "Action " + action + " must be followed by an option: " + Arrays.asList(args)); + + Map> options = new HashMap<>(); + String currentOption = null; + for (int i = actionIndex + 1; i < args.length; i++) { + if (args[i].startsWith("-")) { + currentOption = args[i]; + if (!options.containsKey(currentOption)) + options.put(currentOption, new ArrayList<>()); + + } else { + options.get(currentOption).add(args[i]); } + } + try { Make argeoMake = new Make(); switch (action) { case "compile" -> argeoMake.compile(options); @@ -394,10 +383,59 @@ public class Make { } long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); - System.out.println("Completed after " + jvmUptime + " ms"); + logger.log(INFO, "Make.java action '" + action + "' succesfully completed after " + (jvmUptime / 1000) + "." + + (jvmUptime % 1000) + " s"); } catch (Exception e) { - e.printStackTrace(); + long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime(); + logger.log(ERROR, "Make.java action '" + action + "' failed after " + (jvmUptime / 1000) + "." + + (jvmUptime % 1000) + " s", e); System.exit(1); } } + + /** + * An ECJ {@link CompilationProgress} printing a progress bar while compiling. + */ + static class MakeCompilationProgress extends CompilationProgress { + private int totalWork; + private long currentChunk = 0; + private long chunksCount = 80; + + @Override + public void worked(int workIncrement, int remainingWork) { + if (!logger.isLoggable(Level.INFO)) // progress bar only at INFO level + return; + long chunk = ((totalWork - remainingWork) * chunksCount) / totalWork; + if (chunk != currentChunk) { + currentChunk = chunk; + for (long i = 0; i < currentChunk; i++) { + System.out.print("#"); + } + for (long i = currentChunk; i < chunksCount; i++) { + System.out.print("-"); + } + System.out.print("\r"); + } + if (remainingWork == 0) + System.out.print("\n"); + } + + @Override + public void setTaskName(String name) { + } + + @Override + public boolean isCanceled() { + return false; + } + + @Override + public void done() { + } + + @Override + public void begin(int remainingWork) { + this.totalWork = remainingWork; + } + } }