X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=4f22815f1d4cd5295c20823f309ebb3d080fc097;hb=db89cbf633f301c206628331ea61548ad739eea9;hp=a9676f86d8ac05ccb6487c1e69cb77cb061f2ef7;hpb=6672d3a2c0528a33b5e25539b9acbb73ce0e495c;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index a9676f8..4f22815 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.nio.file.PathMatcher; import java.nio.file.Paths; import java.nio.file.SimpleFileVisitor; +import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Arrays; @@ -225,7 +226,8 @@ public class Make { } // sources - for (String bundle : bundles) { + boolean atLeastOneBundleToCompile = false; + bundles: for (String bundle : bundles) { StringBuilder sb = new StringBuilder(); Path bundlePath = execDirectory.resolve(bundle); if (!Files.exists(bundlePath)) { @@ -236,15 +238,24 @@ public class Make { } else throw new IllegalArgumentException("Bundle " + bundle + " not found in " + execDirectory); } - sb.append(bundlePath.resolve("src")); + Path bundleSrc = bundlePath.resolve("src"); + if (!Files.exists(bundleSrc)) { + logger.log(WARNING, bundleSrc + " does not exist, skipping it, as this is not a Java bundle"); + continue bundles; + } + sb.append(bundleSrc); sb.append("[-d"); compilerArgs.add(sb.toString()); sb = new StringBuilder(); sb.append(buildBase.resolve(bundle).resolve("bin")); sb.append("]"); compilerArgs.add(sb.toString()); + atLeastOneBundleToCompile = true; } + if (!atLeastOneBundleToCompile) + return; + if (logger.isLoggable(INFO)) compilerArgs.add("-time"); @@ -357,16 +368,32 @@ public class Make { logger.log(DEBUG, "Removed " + targetJarP); count++; } + Path targetParent = targetJarP.getParent(); + deleteEmptyParents(targetA2, targetParent); } else { // install Files.createDirectories(targetJarP.getParent()); boolean update = Files.exists(targetJarP); - Files.copy(jarP, targetJarP); + Files.copy(jarP, targetJarP, StandardCopyOption.REPLACE_EXISTING); logger.log(DEBUG, (update ? "Updated " : "Installed ") + targetJarP); + count++; } } logger.log(INFO, uninstall ? count + " bundles removed" : count + " bundles installed or updated"); } + /** Delete empty parent directory up to the A2 target (included). */ + void deleteEmptyParents(Path targetA2, Path targetParent) throws IOException { + if (!Files.isDirectory(targetParent)) + throw new IllegalArgumentException(targetParent + " must be a directory"); + boolean isA2target = Files.isSameFile(targetA2, targetParent); + if (!Files.list(targetParent).iterator().hasNext()) { + Files.delete(targetParent); + if (isA2target) + return;// stop after deleting A2 base + deleteEmptyParents(targetA2, targetParent.getParent()); + } + } + /** Package a single bundle. */ void createBundle(String branch, String bundle, String category) throws IOException { final Path source; @@ -482,6 +509,10 @@ public class Make { 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); @@ -489,32 +520,43 @@ public class Make { } }); - // Add all resources from src/ - Files.walkFileTree(srcP, new SimpleFileVisitor() { - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - if (file.getFileName().toString().endsWith(".java") - || file.getFileName().toString().endsWith(".class")) + if (Files.exists(srcP)) { + // Add all resources from src/ + Files.walkFileTree(srcP, new SimpleFileVisitor() { + @Override + public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { + // skip directories ending with .js + // TODO find something more robust? + if (dir.getFileName().toString().endsWith(".js")) + return FileVisitResult.SKIP_SUBTREE; + return super.preVisitDirectory(dir, attrs); + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + if (file.getFileName().toString().endsWith(".java") + || file.getFileName().toString().endsWith(".class")) + return FileVisitResult.CONTINUE; + jarOut.putNextEntry(new JarEntry(srcP.relativize(file).toString())); + if (!Files.isDirectory(file)) + Files.copy(file, jarOut); return FileVisitResult.CONTINUE; - jarOut.putNextEntry(new JarEntry(srcP.relativize(file).toString())); - if (!Files.isDirectory(file)) - Files.copy(file, jarOut); - return FileVisitResult.CONTINUE; + } + }); + + // add sources + // TODO add effective BND, Eclipse project file, etc., in order to be able to + // repackage + if (!sourceBundles) { + copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/"); } - }); + } // add legal notices and licenses for (Path p : listLegalFilesToInclude(source).values()) { jarOut.putNextEntry(new JarEntry(p.getFileName().toString())); Files.copy(p, jarOut); } - - // add sources - // TODO add effective BND, Eclipse project file, etc., in order to be able to - // repackage - if (!sourceBundles) { - copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/"); - } } if (sourceBundles) {// create separate sources jar @@ -527,15 +569,36 @@ public class Make { srcManifest.getMainAttributes().putValue("Bundle-SymbolicName", bundleSymbolicName + ".src"); srcManifest.getMainAttributes().putValue("Bundle-Version", manifest.getMainAttributes().getValue("Bundle-Version").toString()); - 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()) { - srcJarOut.putNextEntry(new JarEntry(p.getFileName().toString())); - Files.copy(p, srcJarOut); + + 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()) { + srcJarOut.putNextEntry(new JarEntry(p.getFileName().toString())); + Files.copy(p, srcJarOut); + } + } + } else {// JavaScript source maps + srcManifest.getMainAttributes().putValue("Fragment-Host", + bundleSymbolicName + ";version=\"" + manifest.getMainAttributes().getValue("Bundle-Version")); + try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) { + Files.walkFileTree(source, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + Path relativeP = source.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; + } + }); } } }