Read branch directly from branch.mk

[cc0/argeo-build.git] / src / org / argeo / build / Make.java

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 90e97961bf848e3d98065bbd3ebfeb329604febb..6f8434434a8b82d7436b0da1592a4a934ffb36e7 100644 (file)
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -51,6 +51,8 @@ public class Make {
 
        /** 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;
@@ -74,19 +76,7 @@ public class Make {
                Path sdkMkP = findSdkMk(execDirectory);
                Objects.requireNonNull(sdkMkP, "No " + SDK_MK + " found under " + execDirectory);
 
-               Map<String, String> context = new HashMap<>();
-               List<String> 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<String, String> context = readeMakefileVariables(sdkMkP);
                sdkSrcBase = Paths.get(context.computeIfAbsent("SDK_SRC_BASE", (key) -> {
                        throw new IllegalStateException(key + " not found");
                })).toAbsolutePath();
@@ -129,26 +119,33 @@ 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());
                                        }
                                }
                        }
+                       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();
@@ -160,6 +157,9 @@ public class Make {
                if (logger.isLoggable(INFO))
                        compilerArgs.add("-time");
 
+//             for (String arg : compilerArgs)
+//                     System.out.println(arg);
+
                boolean success = org.eclipse.jdt.core.compiler.batch.BatchCompiler.compile(
                                compilerArgs.toArray(new String[compilerArgs.size()]), new PrintWriter(System.out),
                                new PrintWriter(System.err), new MakeCompilationProgress());
@@ -168,7 +168,7 @@ public class Make {
        }
 
        /** Package the bundles. */
-       void bundle(Map<String, List<String>> options) {
+       void bundle(Map<String, List<String>> options) throws IOException {
                // check arguments
                List<String> bundles = options.get("--bundles");
                Objects.requireNonNull(bundles, "--bundles argument must be set");
@@ -181,10 +181,12 @@ public class Make {
                        throw new IllegalArgumentException("One and only one --category must be specified");
                String category = categories.get(0);
 
-               List<String> 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<String, String> branchVariables = readeMakefileVariables(branchMk);
+
+               String branch = branchVariables.get("BRANCH");
 
                long begin = System.currentTimeMillis();
                // create jars in parallel
@@ -316,7 +318,8 @@ public class Make {
                                @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;
                                }
                        });
@@ -327,7 +330,7 @@ public class Make {
         * Recursively find the base source directory (which contains the
         * <code>{@value #SDK_MK}</code> file).
         */
-       private Path findSdkMk(Path directory) {
+       Path findSdkMk(Path directory) {
                Path sdkMkP = directory.resolve(SDK_MK);
                if (Files.exists(sdkMkP)) {
                        return sdkMkP.toAbsolutePath();
@@ -337,6 +340,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<String, String> readeMakefileVariables(Path path) throws IOException {
+               Map<String, String> context = new HashMap<>();
+               List<String> 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)