Make logging less verbose

[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 2568d9baebb2c145dc01ac87377faba0ab8f9d1a..34477cf7639ebcc22ec2800c81a7aaa86479c830 100644 (file)
--- 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;
@@ -310,7 +309,7 @@ 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. */
@@ -397,18 +396,18 @@ public class Make {
 
        /** 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 +424,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);
@@ -488,7 +487,7 @@ public class Make {
                        });
 
                        // add resources
-                       Files.walkFileTree(source, new SimpleFileVisitor<Path>() {
+                       Files.walkFileTree(bundleSourceBase, new SimpleFileVisitor<Path>() {
                                @Override
                                public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
                                        // skip output directory if it happens to be within the sources
@@ -496,7 +495,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 +505,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);
@@ -548,9 +551,9 @@ public class Make {
                                        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);
                        }
@@ -561,22 +564,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<Path>() {
+                                       @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;
+                                       }
+                               });
+                       }
                }
        }
 
@@ -699,8 +729,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) + "."