X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=b9fd48d3e96ca08539c74fd53c726b66fa1a0796;hb=0499267b5f2b534d852cc8a2d5a7070b21730ed4;hp=d92ca98ef47ab6182acaca9202cc827c64fc384b;hpb=bae76acac3346f98f433547ab3c5f7ea62f64b53;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index d92ca98..b9fd48d 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -31,6 +31,7 @@ import java.util.concurrent.CompletableFuture; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import java.util.zip.Deflater; import org.eclipse.jdt.core.compiler.CompilationProgress; @@ -49,8 +50,16 @@ import aQute.bnd.osgi.Jar; public class Make { private final static Logger logger = System.getLogger(Make.class.getName()); + /** + * Environment properties on whether sources should be packaged separately or + * integrated in the bundles. + */ + private final static String ENV_BUILD_SOURCE_BUNDLES = "BUILD_SOURCE_BUNDLES"; + /** Name of the local-specific Makefile (sdk.mk). */ final static String SDK_MK = "sdk.mk"; + /** Name of the branch definition Makefile (branch.mk). */ + final static String BRANCH_MK = "branch.mk"; /** The execution directory (${user.dir}). */ final Path execDirectory; @@ -68,25 +77,20 @@ public class Make { /** The base of the a2 output for all layers. */ final Path a2Output; + /** Whether sources should be packaged separately */ + final boolean sourceBundles; + /** Constructor initialises the base directories. */ public Make() throws IOException { + sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES)); + if (sourceBundles) + logger.log(Level.INFO, "Sources will be packaged separately"); + execDirectory = Paths.get(System.getProperty("user.dir")); Path sdkMkP = findSdkMk(execDirectory); Objects.requireNonNull(sdkMkP, "No " + SDK_MK + " found under " + execDirectory); - Map context = new HashMap<>(); - List sdkMkLines = Files.readAllLines(sdkMkP); - lines: for (String line : sdkMkLines) { - StringTokenizer st = new StringTokenizer(line, " :="); - if (!st.hasMoreTokens()) - continue lines; - String key = st.nextToken(); - if (!st.hasMoreTokens()) - continue lines; - String value = st.nextToken(); - context.put(key, value); - } - + Map context = readeMakefileVariables(sdkMkP); sdkSrcBase = Paths.get(context.computeIfAbsent("SDK_SRC_BASE", (key) -> { throw new IllegalStateException(key + " not found"); })).toAbsolutePath(); @@ -178,7 +182,7 @@ public class Make { } /** Package the bundles. */ - void bundle(Map> options) { + void bundle(Map> options) throws IOException { // check arguments List bundles = options.get("--bundles"); Objects.requireNonNull(bundles, "--bundles argument must be set"); @@ -191,10 +195,12 @@ public class Make { throw new IllegalArgumentException("One and only one --category must be specified"); String category = categories.get(0); - 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); + Path branchMk = sdkSrcBase.resolve(BRANCH_MK); + if (!Files.exists(branchMk)) + throw new IllegalStateException("No " + branchMk + " file available"); + Map branchVariables = readeMakefileVariables(branchMk); + + String branch = branchVariables.get("BRANCH"); long begin = System.currentTimeMillis(); // create jars in parallel @@ -240,7 +246,8 @@ public class Make { } // Normalise - properties.put("Bundle-SymbolicName", bundleSymbolicName); + if (!properties.containsKey("Bundle-SymbolicName")) + properties.put("Bundle-SymbolicName", bundleSymbolicName); // Calculate MANIFEST Path binP = compiled.resolve("bin"); @@ -283,6 +290,7 @@ public class Make { Files.createDirectories(jarP.getParent()); try (JarOutputStream jarOut = new JarOutputStream(Files.newOutputStream(jarP), manifest)) { + jarOut.setLevel(Deflater.DEFAULT_COMPRESSION); // add all classes first Files.walkFileTree(binP, new SimpleFileVisitor() { @Override @@ -318,19 +326,37 @@ public class Make { } }); - // add sources - // TODO add effective BND, Eclipse project file, etc., in order to be able to - // repackage 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 { - jarOut.putNextEntry(new JarEntry("OSGI-OPT/src/" + srcP.relativize(file).toString())); + 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; } }); + + // add sources + // TODO add effective BND, Eclipse project file, etc., in order to be able to + // repackage + if (sourceBundles) { + // TODO package sources separately + } else { + 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())); + if (!Files.isDirectory(file)) + Files.copy(file, jarOut); + return FileVisitResult.CONTINUE; + } + }); + } } } @@ -338,7 +364,7 @@ public class Make { * Recursively find the base source directory (which contains the * {@value #SDK_MK} file). */ - private Path findSdkMk(Path directory) { + Path findSdkMk(Path directory) { Path sdkMkP = directory.resolve(SDK_MK); if (Files.exists(sdkMkP)) { return sdkMkP.toAbsolutePath(); @@ -348,6 +374,28 @@ public class Make { return findSdkMk(directory.getParent()); } + /** + * 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 context = new HashMap<>(); + List sdkMkLines = Files.readAllLines(path); + lines: for (String line : sdkMkLines) { + StringTokenizer st = new StringTokenizer(line, " :=?"); + if (!st.hasMoreTokens()) + continue lines; + String key = st.nextToken(); + if (!st.hasMoreTokens()) + continue lines; + String value = st.nextToken(); + if (st.hasMoreTokens()) // probably not a simple variable assignment + continue lines; + context.put(key, value); + } + return context; + } + /** Main entry point, interpreting actions and arguments. */ public static void main(String... args) { if (args.length == 0)