X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=2a9331d559e611c943c53f2192a52741ecb4a270;hb=HEAD;hp=310c6ca186bc974eecf72ba1c9ace6adc5269f86;hpb=fcb10e7247b6eb7cbd2dbd9b49e029596ba5436a;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 310c6ca..2a9331d 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -23,6 +23,7 @@ import static org.argeo.build.Repackage.ManifestHeader.BUNDLE_VERSION; import static org.argeo.build.Repackage.ManifestHeader.ECLIPSE_SOURCE_BUNDLE; import static org.argeo.build.Repackage.ManifestHeader.EXPORT_PACKAGE; import static org.argeo.build.Repackage.ManifestHeader.IMPORT_PACKAGE; +import static org.argeo.build.Repackage.ManifestHeader.REQUIRE_BUNDLE; import static org.argeo.build.Repackage.ManifestHeader.SPDX_LICENSE_IDENTIFIER; import java.io.BufferedWriter; @@ -32,8 +33,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.System.Logger; -import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.nio.file.DirectoryStream; import java.nio.file.FileSystem; @@ -99,7 +100,7 @@ public class Repackage { List> toDos = new ArrayList<>(); for (int i = 1; i < args.length; i++) { Path categoryPath = Paths.get(args[i]); - cleanPreviousFailedBuild(categoryPath); + factory.cleanPreviousFailedBuild(categoryPath); if (sequential) // sequential processing happens here factory.processCategory(categoryPath); else @@ -117,10 +118,13 @@ public class Repackage { } /** Deletes remaining sub directories. */ - static void cleanPreviousFailedBuild(Path categoryPath) { + void cleanPreviousFailedBuild(Path categoryPath) { + Path outputCategoryPath = a2Base.resolve(categoryPath); + if (!Files.exists(outputCategoryPath)) + return; // clean previous failed build try { - for (Path subDir : Files.newDirectoryStream(categoryPath, (d) -> Files.isDirectory(d))) { + for (Path subDir : Files.newDirectoryStream(outputCategoryPath, (d) -> Files.isDirectory(d))) { if (Files.exists(subDir)) { logger.log(WARNING, "Bundle dir " + subDir + " already exists, probably from a previous failed build, deleting it..."); @@ -145,6 +149,8 @@ public class Repackage { EXPORT_PACKAGE("Export-Package"), // /** OSGi imported packages list. */ IMPORT_PACKAGE("Import-Package"), // + /** OSGi required bundles. */ + REQUIRE_BUNDLE("Require-Bundle"), // /** OSGi path to embedded jar. */ BUNDLE_CLASSPATH("Bundle-Classpath"), // // Java @@ -171,7 +177,7 @@ public class Repackage { /** Maven repository, if not the default one. */ ARGEO_ORIGIN_M2_REPO("Argeo-Origin-M2-Repo"), // /** - * Do not perform BND analysis of the origin component. Typically Import_package + * Do not perform BND analysis of the origin component. Typically Import-Package * and Export-Package will be kept untouched. */ ARGEO_ORIGIN_NO_METADATA_GENERATION("Argeo-Origin-NoMetadataGeneration"), // @@ -435,7 +441,7 @@ public class Repackage { if (artifact.getVersion() == null) { artifact.setVersion(m2Version); } else { - logger.log(WARNING, p.getFileName() + " : Using version " + artifact.getVersion() + logger.log(DEBUG, p.getFileName() + " : Using version " + artifact.getVersion() + " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND); } @@ -575,9 +581,9 @@ public class Repackage { } if (entry.getName().endsWith("NOTICE") || entry.getName().endsWith("NOTICE.txt") - || entry.getName().endsWith("LICENSE") || entry.getName().endsWith("LICENSE.md") - || entry.getName().endsWith("LICENSE-notice.md") || entry.getName().endsWith("COPYING") - || entry.getName().endsWith("COPYING.LESSER")) { + || entry.getName().endsWith("NOTICE.md") || entry.getName().endsWith("LICENSE") + || entry.getName().endsWith("LICENSE.md") || entry.getName().endsWith("LICENSE-notice.md") + || entry.getName().endsWith("COPYING") || entry.getName().endsWith("COPYING.LESSER")) { Path artifactOriginDir = bundleDir.resolve(ARGEO_ORIGIN).resolve(artifact.getGroupId()) .resolve(artifact.getArtifactId()); Path target = artifactOriginDir.resolve(entry.getName()); @@ -704,7 +710,8 @@ public class Repackage { } if (!fileProps.containsKey(EXPORT_PACKAGE.toString())) { - fileProps.put(EXPORT_PACKAGE.toString(), "*"); + fileProps.put(EXPORT_PACKAGE.toString(), + "*;version=\"" + fileProps.getProperty(BUNDLE_VERSION.toString()) + "\""); } // BND analysis @@ -769,7 +776,7 @@ public class Repackage { : null; String alternateUri = props.getProperty(ARGEO_ORIGIN_SOURCES_URI.toString()); M2Artifact sourcesArtifact = new M2Artifact(artifact.toM2Coordinates(), "sources"); - URL sourcesUrl = alternateUri != null ? new URL(alternateUri) + URI sourcesUrl = alternateUri != null ? new URI(alternateUri) : M2ConventionsUtils.mavenRepoUrl(repoStr, sourcesArtifact); Path sourcesDownloaded = downloadMaven(sourcesUrl, sourcesArtifact); processM2SourceJar(sourcesDownloaded, targetBundleDir, merging ? artifact : null, unmodified); @@ -843,13 +850,17 @@ public class Repackage { ? props.getProperty(ARGEO_ORIGIN_M2_REPO.toString()) : null; String alternateUri = props.getProperty(ARGEO_ORIGIN_URI.toString()); - URL url = alternateUri != null ? new URL(alternateUri) : M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); - return downloadMaven(url, artifact); + try { + URI uri = alternateUri != null ? new URI(alternateUri) : M2ConventionsUtils.mavenRepoUrl(repoStr, artifact); + return downloadMaven(uri, artifact); + } catch (URISyntaxException e) { + throw new IllegalArgumentException("Wrong aritfact URI", e); + } } /** Download a Maven artifact. */ - Path downloadMaven(URL url, M2Artifact artifact) throws IOException { - return download(url, mavenBase, M2ConventionsUtils.artifactPath("", artifact)); + Path downloadMaven(URI uri, M2Artifact artifact) throws IOException { + return download(uri, mavenBase, M2ConventionsUtils.artifactPath("", artifact)); } /* @@ -930,6 +941,10 @@ public class Repackage { map.put(key.toString(), commonProps.getProperty(key.toString())); A2Origin origin = new A2Origin(); Path bundleDir = processBundleJar(file, targetCategoryBase, map, origin); + if (bundleDir == null) { + logger.log(WARNING, "No bundle dir created for " + file + ", skipping..."); + return FileVisitResult.CONTINUE; + } origins.put(bundleDir, origin); logger.log(DEBUG, () -> "Processed " + file); } @@ -1013,6 +1028,8 @@ public class Repackage { Manifest sourceManifest; try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) { sourceManifest = jarIn.getManifest(); + if (sourceManifest == null) + logger.log(WARNING, file + " has no manifest"); manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest(); String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString()); @@ -1035,6 +1052,8 @@ public class Repackage { nameVersion = new NameVersion(ourSymbolicName, ourVersion); } else { nameVersion = nameVersionFromManifest(manifest); + if (nameVersion == null) + throw new IllegalStateException("Could not compute name/version from Manifest"); if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) { logger.log(WARNING, "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion); @@ -1110,8 +1129,9 @@ public class Repackage { Files.copy(jarIn, target); // native libraries + boolean removeDllFromJar = true; if (isNative && (entry.getName().endsWith(".so") || entry.getName().endsWith(".dll") - || entry.getName().endsWith(".jnilib"))) { + || entry.getName().endsWith(".jnilib") || entry.getName().endsWith(".a"))) { Path categoryDir = bundleDir.getParent(); boolean copyDll = false; Path targetDll = categoryDir.resolve(bundleDir.relativize(target)); @@ -1133,8 +1153,11 @@ public class Repackage { Files.delete(targetDll); Files.copy(target, targetDll); } - Files.delete(target); - origin.deleted.add(bundleDir.relativize(target).toString()); + + if (removeDllFromJar) { + Files.delete(target); + origin.deleted.add(bundleDir.relativize(target).toString()); + } } logger.log(TRACE, () -> "Copied " + target); } @@ -1196,7 +1219,11 @@ public class Repackage { for (Iterator> manifestEntries = manifest.getMainAttributes().entrySet() .iterator(); manifestEntries.hasNext();) { Map.Entry manifestEntry = manifestEntries.next(); - switch (manifestEntry.getKey().toString()) { + String key = manifestEntry.getKey().toString(); + // TODO make it more generic + if (key.equals(REQUIRE_BUNDLE.toString()) && nameVersion.getName().equals("com.sun.jna.platform")) + manifestEntries.remove(); + switch (key) { case "Archiver-Version": case "Build-By": case "Created-By": @@ -1297,12 +1324,12 @@ public class Repackage { } /** Try to download from an URI. */ - Path tryDownloadArchive(String uri, Path dir) throws IOException { + Path tryDownloadArchive(String uriStr, Path dir) throws IOException { // find mirror List urlBases = null; String uriPrefix = null; uriPrefixes: for (String uriPref : mirrors.keySet()) { - if (uri.startsWith(uriPref)) { + if (uriStr.startsWith(uriPref)) { if (mirrors.get(uriPref).size() > 0) { urlBases = mirrors.get(uriPref); uriPrefix = uriPref; @@ -1312,54 +1339,56 @@ public class Repackage { } if (urlBases == null) try { - return downloadArchive(new URL(uri), dir); - } catch (FileNotFoundException e) { - throw new FileNotFoundException("Cannot find " + uri); + return downloadArchive(new URI(uriStr), dir); + } catch (FileNotFoundException | URISyntaxException e) { + throw new FileNotFoundException("Cannot find " + uriStr); } // try to download for (String urlBase : urlBases) { - String relativePath = uri.substring(uriPrefix.length()); - URL url = new URL(urlBase + relativePath); + String relativePath = uriStr.substring(uriPrefix.length()); + String uStr = urlBase + relativePath; try { - return downloadArchive(url, dir); - } catch (FileNotFoundException e) { - logger.log(WARNING, "Cannot download " + url + ", trying another mirror"); + return downloadArchive(new URI(uStr), dir); + } catch (FileNotFoundException | URISyntaxException e) { + logger.log(WARNING, "Cannot download " + uStr + ", trying another mirror"); } } - throw new FileNotFoundException("Cannot find " + uri); + throw new FileNotFoundException("Cannot find " + uriStr); } /** - * Effectively download. Synchronised in order to avoid downloading twice in - * parallel. + * Effectively download an archive. */ - synchronized Path downloadArchive(URL url, Path dir) throws IOException { - return download(url, dir, (String) null); + Path downloadArchive(URI uri, Path dir) throws IOException { + return download(uri, dir, (String) null); } - /** Effectively download. */ - Path download(URL url, Path dir, String name) throws IOException { + /** + * Effectively download. Synchronised in order to avoid downloading twice in + * parallel. + */ + synchronized Path download(URI uri, Path dir, String name) throws IOException { Path dest; if (name == null) { // We use also use parent directory in case the archive itself has a fixed name - String[] segments = url.getPath().split("/"); + String[] segments = uri.getPath().split("/"); name = segments.length > 1 ? segments[segments.length - 2] + '-' + segments[segments.length - 1] : segments[segments.length - 1]; } dest = dir.resolve(name); if (Files.exists(dest)) { - logger.log(TRACE, () -> "File " + dest + " already exists for " + url + ", not downloading again"); + logger.log(TRACE, () -> "File " + dest + " already exists for " + uri + ", not downloading again"); return dest; } else { Files.createDirectories(dest.getParent()); } - try (InputStream in = url.openStream()) { + try (InputStream in = uri.toURL().openStream()) { Files.copy(in, dest); - logger.log(DEBUG, () -> "Downloaded " + dest + " from " + url); + logger.log(DEBUG, () -> "Downloaded " + dest + " from " + uri); } return dest; } @@ -1619,14 +1648,9 @@ class M2ConventionsUtils { } /** Absolute path to the file */ - static URL mavenRepoUrl(String repoBase, M2Artifact artifact) { - String url = artifactUrl(repoBase == null ? MAVEN_CENTRAL_BASE_URL : repoBase, artifact); - try { - return new URL(url); - } catch (MalformedURLException e) { - // it should not happen - throw new IllegalStateException(e); - } + static URI mavenRepoUrl(String repoBase, M2Artifact artifact) throws URISyntaxException { + String uri = artifactUrl(repoBase == null ? MAVEN_CENTRAL_BASE_URL : repoBase, artifact); + return new URI(uri); } /** Absolute path to the directories where the files will be stored */