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;
List<CompletableFuture<Void>> toDos = new ArrayList<>();
for (int i = 1; i < args.length; i++) {
- Path p = Paths.get(args[i]);
- if (sequential)
- factory.processCategory(p);
+ Path categoryPath = Paths.get(args[i]);
+ factory.cleanPreviousFailedBuild(categoryPath);
+ if (sequential) // sequential processing happens here
+ factory.processCategory(categoryPath);
else
- toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(p)));
+ toDos.add(CompletableFuture.runAsync(() -> factory.processCategory(categoryPath)));
}
- if (!sequential)
+ if (!sequential)// parallel processing
CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join();
// Summary
logger.log(INFO, "# License summary:\n" + sb);
}
+ /** Deletes remaining sub directories. */
+ void cleanPreviousFailedBuild(Path categoryPath) {
+ Path outputCategoryPath = a2Base.resolve(categoryPath);
+ if (!Files.exists(outputCategoryPath))
+ return;
+ // clean previous failed build
+ try {
+ 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...");
+ deleteDirectory(subDir);
+ }
+ }
+ } catch (IOException e) {
+ logger.log(ERROR, "Cannot clean previous build", e);
+ }
+ }
+
/** MANIFEST headers. */
enum ManifestHeader {
// OSGi
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);
}
}
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());
: 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);
? 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));
}
/*
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);
}
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());
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);
nameVersion.setName(ourSymbolicName);
}
}
+
bundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch());
// copy original MANIFEST
arch = libRelativePath.getName(1).toString();
}
-// if (!embed) {
// copy entries
JarEntry entry;
entries: while ((entry = jarIn.getNextJarEntry()) != null) {
Files.copy(jarIn, target);
// native libraries
+ boolean removeDllFromJar = true;
if (isNative && (entry.getName().endsWith(".so") || entry.getName().endsWith(".dll")
|| entry.getName().endsWith(".jnilib"))) {
Path categoryDir = bundleDir.getParent();
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);
-// }
}
}
entries.get(BUNDLE_SYMBOLICNAME.toString()) + ";singleton:=true");
}
-// if (embed) {// copy embedded jar
-// Files.copy(file, bundleDir.resolve(file.getFileName()));
-// entries.put(ManifestHeader.BUNDLE_CLASSPATH.toString(), file.getFileName().toString());
-// }
-
// Final MANIFEST decisions
// We also check the original OSGi metadata and compare with our changes
for (String key : entries.keySet()) {
}
/** 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<String> 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;
}
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;
}
}
/** 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 */
projects / cc0 / argeo-build.git / blobdiff