X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=037ddbd7cd26b2325d64126a34ececfc32370219;hb=63195abf34dfc47a0950289ea8ca666ce48aa802;hp=de99e5f8c453af44d532d69f67db3952ddafc204;hpb=99aca0efea44087a660cfc879bc6037440c3b128;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index de99e5f..037ddbd 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -7,6 +7,7 @@ import static org.argeo.build.Repackage.ManifestConstants.EXPORT_PACKAGE; import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2; import static org.argeo.build.Repackage.ManifestConstants.SLC_ORIGIN_M2_REPO; +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -35,6 +36,7 @@ import java.util.Map; import java.util.Objects; import java.util.Properties; import java.util.TreeMap; +import java.util.concurrent.CompletableFuture; import java.util.jar.Attributes; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; @@ -49,6 +51,8 @@ import aQute.bnd.osgi.Jar; public class Repackage { private final static Logger logger = System.getLogger(Repackage.class.getName()); + private final static String ENV_BUILD_SOURCE_BUNDLES = "BUILD_SOURCE_BUNDLES"; + /** Main entry point. */ public static void main(String[] args) { if (args.length < 2) { @@ -57,12 +61,14 @@ public class Repackage { } Path a2Base = Paths.get(args[0]).toAbsolutePath().normalize(); Path descriptorsBase = Paths.get(".").toAbsolutePath().normalize(); - Repackage factory = new Repackage(a2Base, descriptorsBase, true); + Repackage factory = new Repackage(a2Base, descriptorsBase); + List> toDos = new ArrayList<>(); for (int i = 1; i < args.length; i++) { Path p = Paths.get(args[i]); - factory.processCategory(p); + toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(p))); } + CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join(); } private final static String COMMON_BND = "common.bnd"; @@ -75,12 +81,16 @@ public class Repackage { private Properties uris = new Properties(); - private boolean includeSources = true; - /** key is URI prefix, value list of base URLs */ private Map> mirrors = new HashMap>(); - public Repackage(Path a2Base, Path descriptorsBase, boolean includeSources) { + private final boolean sourceBundles; + + public Repackage(Path a2Base, Path descriptorsBase) { + sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES)); + if (sourceBundles) + logger.log(Level.INFO, "Sources will be packaged separately"); + Objects.requireNonNull(a2Base); Objects.requireNonNull(descriptorsBase); this.originBase = Paths.get(System.getProperty("user.home"), ".cache", "argeo/build/origin"); @@ -90,7 +100,6 @@ public class Repackage { this.descriptorsBase = descriptorsBase; if (!Files.exists(this.descriptorsBase)) throw new IllegalArgumentException(this.descriptorsBase + " does not exist"); - this.includeSources = includeSources; // URIs mapping Path urisPath = this.descriptorsBase.resolve("uris.properties"); @@ -302,6 +311,10 @@ public class Repackage { mergeProps.put(ManifestConstants.BUNDLE_VERSION.toString(), m2Version); String artifactsStr = mergeProps.getProperty(ManifestConstants.SLC_ORIGIN_M2_MERGE.toString()); + if (artifactsStr == null) + throw new IllegalArgumentException( + mergeBnd + ": " + ManifestConstants.SLC_ORIGIN_M2_MERGE + " must be set"); + String repoStr = mergeProps.containsKey(SLC_ORIGIN_M2_REPO.toString()) ? mergeProps.getProperty(SLC_ORIGIN_M2_REPO.toString()) : null; @@ -358,8 +371,7 @@ public class Repackage { try (OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND)) { out.write("\n".getBytes()); jarIn.transferTo(out); - if (logger.isLoggable(DEBUG)) - logger.log(DEBUG, artifact.getArtifactId() + " - Appended " + entry.getName()); + logger.log(Level.WARNING, artifact.getArtifactId() + " - Appended " + entry.getName()); } } else if (entry.getName().startsWith("org/apache/batik/")) { logger.log(Level.WARNING, "Skip " + entry.getName()); @@ -384,8 +396,7 @@ public class Repackage { OutputStream out = Files.newOutputStream(target, StandardOpenOption.APPEND);) { out.write("\n".getBytes()); in.transferTo(out); - if (logger.isLoggable(DEBUG)) - logger.log(DEBUG, "Appended " + p); + logger.log(Level.WARNING, "Appended " + p); } } } @@ -499,13 +510,17 @@ public class Repackage { /** Download and integrates sources for a single Maven artifact. */ protected void downloadAndProcessM2Sources(String repoStr, M2Artifact artifact, Path targetBundleDir) throws IOException { - if (!includeSources) + if (sourceBundles) return; - M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources"); - URL sourcesUrl = M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact); - Path sourcesDownloaded = download(sourcesUrl, originBase, artifact, true); - processM2SourceJar(sourcesDownloaded, targetBundleDir); - logger.log(Level.TRACE, () -> "Processed source " + sourcesDownloaded); + try { + M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources"); + URL sourcesUrl = M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact); + Path sourcesDownloaded = download(sourcesUrl, originBase, artifact, true); + processM2SourceJar(sourcesDownloaded, targetBundleDir); + logger.log(Level.TRACE, () -> "Processed source " + sourcesDownloaded); + } catch (Exception e) { + logger.log(Level.ERROR, () -> "Cannot download source for " + artifact); + } } @@ -626,9 +641,11 @@ public class Repackage { return FileVisitResult.CONTINUE; } } - if (includeSources && file.getFileName().toString().contains(".source_")) { - processEclipseSourceJar(file, targetCategoryBase); - logger.log(Level.DEBUG, () -> "Processed source " + file); + if (file.getFileName().toString().contains(".source_")) { + if (!sourceBundles) { + processEclipseSourceJar(file, targetCategoryBase); + logger.log(Level.DEBUG, () -> "Processed source " + file); + } } else { Map map = new HashMap<>(); @@ -825,7 +842,8 @@ public class Repackage { Object previousValue = manifest.getMainAttributes().putValue(key, value); if (previousValue != null && !previousValue.equals(value)) { if (ManifestConstants.IMPORT_PACKAGE.toString().equals(key) - || ManifestConstants.EXPORT_PACKAGE.toString().equals(key)) + || ManifestConstants.EXPORT_PACKAGE.toString().equals(key) + || ManifestConstants.BUNDLE_LICENSE.toString().equals(key)) logger.log(Level.TRACE, file.getFileName() + ": " + key + " was modified"); else logger.log(Level.WARNING, file.getFileName() + ": " + key + " was " + previousValue @@ -963,7 +981,8 @@ public class Repackage { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { if (file.getFileName().toString().equals("MANIFEST.MF")) return super.visitFile(file, attrs); - JarEntry entry = new JarEntry(bundleDir.relativize(file).toString()); + JarEntry entry = new JarEntry( + bundleDir.relativize(file).toString().replace(File.separatorChar, '/')); jarOut.putNextEntry(entry); Files.copy(file, jarOut); return super.visitFile(file, attrs);