import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
+import java.util.zip.Deflater;
import org.eclipse.jdt.core.compiler.CompilationProgress;
/** Name of the local-specific Makefile (sdk.mk). */
final static String SDK_MK = "sdk.mk";
+ /** Name of the branch definition Makefile (branch.mk). */
+ final static String BRANCH_MK = "branch.mk";
/** The execution directory (${user.dir}). */
final Path execDirectory;
Path sdkMkP = findSdkMk(execDirectory);
Objects.requireNonNull(sdkMkP, "No " + SDK_MK + " found under " + execDirectory);
- Map<String, String> context = new HashMap<>();
- List<String> sdkMkLines = Files.readAllLines(sdkMkP);
- lines: for (String line : sdkMkLines) {
- StringTokenizer st = new StringTokenizer(line, " :=");
- if (!st.hasMoreTokens())
- continue lines;
- String key = st.nextToken();
- if (!st.hasMoreTokens())
- continue lines;
- String value = st.nextToken();
- context.put(key, value);
- }
-
+ Map<String, String> context = readeMakefileVariables(sdkMkP);
sdkSrcBase = Paths.get(context.computeIfAbsent("SDK_SRC_BASE", (key) -> {
throw new IllegalStateException(key + " not found");
})).toAbsolutePath();
// classpath
if (!a2Categories.isEmpty()) {
- compilerArgs.add("-cp");
StringJoiner classPath = new StringJoiner(File.pathSeparator);
+ StringJoiner modulePath = new StringJoiner(File.pathSeparator);
for (String a2Base : a2Bases) {
for (String a2Category : a2Categories) {
Path a2Dir = Paths.get(a2Base).resolve(a2Category);
if (!Files.exists(a2Dir))
Files.createDirectories(a2Dir);
+ modulePath.add(a2Dir.toString());
for (Path jarP : Files.newDirectoryStream(a2Dir,
(p) -> p.getFileName().toString().endsWith(".jar"))) {
classPath.add(jarP.toString());
}
}
}
+ compilerArgs.add("-cp");
compilerArgs.add(classPath.toString());
+// compilerArgs.add("--module-path");
+// compilerArgs.add(modulePath.toString());
}
// sources
for (String bundle : bundles) {
StringBuilder sb = new StringBuilder();
- sb.append(execDirectory.resolve(bundle).resolve("src"));
+ Path bundlePath = execDirectory.resolve(bundle);
+ if (!Files.exists(bundlePath))
+ throw new IllegalArgumentException("Bundle " + bundle + " not found in " + execDirectory);
+ sb.append(bundlePath.resolve("src"));
sb.append("[-d");
compilerArgs.add(sb.toString());
sb = new StringBuilder();
if (logger.isLoggable(INFO))
compilerArgs.add("-time");
+// for (String arg : compilerArgs)
+// System.out.println(arg);
+
boolean success = org.eclipse.jdt.core.compiler.batch.BatchCompiler.compile(
compilerArgs.toArray(new String[compilerArgs.size()]), new PrintWriter(System.out),
new PrintWriter(System.err), new MakeCompilationProgress());
}
/** Package the bundles. */
- void bundle(Map<String, List<String>> options) {
+ void bundle(Map<String, List<String>> options) throws IOException {
// check arguments
List<String> bundles = options.get("--bundles");
Objects.requireNonNull(bundles, "--bundles argument must be set");
return;
List<String> categories = options.get("--category");
- Objects.requireNonNull(bundles, "--bundles argument must be set");
+ Objects.requireNonNull(bundles, "--category argument must be set");
if (categories.size() != 1)
- throw new IllegalArgumentException("One and only one category must be specified");
+ throw new IllegalArgumentException("One and only one --category must be specified");
String category = categories.get(0);
+ Path branchMk = sdkSrcBase.resolve(BRANCH_MK);
+ if (!Files.exists(branchMk))
+ throw new IllegalStateException("No " + branchMk + " file available");
+ Map<String, String> branchVariables = readeMakefileVariables(branchMk);
+
+ String branch = branchVariables.get("BRANCH");
+
long begin = System.currentTimeMillis();
// create jars in parallel
List<CompletableFuture<Void>> toDos = new ArrayList<>();
for (String bundle : bundles) {
toDos.add(CompletableFuture.runAsync(() -> {
try {
- createBundle(bundle, category);
+ createBundle(branch, bundle, category);
} catch (IOException e) {
throw new RuntimeException("Packaging of " + bundle + " failed", e);
}
* UTILITIES
*/
/** Package a single bundle. */
- void createBundle(String bundle, String category) throws IOException {
+ void createBundle(String branch, String bundle, String category) throws IOException {
Path source = execDirectory.resolve(bundle);
Path compiled = buildBase.resolve(bundle);
String bundleSymbolicName = source.getFileName().toString();
try (InputStream in = Files.newInputStream(argeoBnd)) {
properties.load(in);
}
- // FIXME make it configurable
- Path branchBnd = sdkSrcBase.resolve("cnf/unstable.bnd");
+
+ Path branchBnd = sdkSrcBase.resolve("sdk/branches/" + branch + ".bnd");
try (InputStream in = Files.newInputStream(branchBnd)) {
properties.load(in);
}
throw new RuntimeException("Bnd analysis of " + compiled + " failed", e);
}
- String major = properties.getProperty("MAJOR");
- Objects.requireNonNull(major, "MAJOR must be set");
- String minor = properties.getProperty("MINOR");
- Objects.requireNonNull(minor, "MINOR must be set");
+ String major = properties.getProperty("major");
+ Objects.requireNonNull(major, "'major' must be set");
+ String minor = properties.getProperty("minor");
+ Objects.requireNonNull(minor, "'minor' must be set");
// Write manifest
Path manifestP = compiled.resolve("META-INF/MANIFEST.MF");
Files.createDirectories(jarP.getParent());
try (JarOutputStream jarOut = new JarOutputStream(Files.newOutputStream(jarP), manifest)) {
+ jarOut.setLevel(Deflater.DEFAULT_COMPRESSION);
// add all classes first
Files.walkFileTree(binP, new SimpleFileVisitor<Path>() {
@Override
}
});
+ Path srcP = source.resolve("src");
+ // Add all resources from src/
+ Files.walkFileTree(srcP, new SimpleFileVisitor<Path>() {
+ @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;
+ }
+ });
+
// add sources
// TODO add effective BND, Eclipse project file, etc., in order to be able to
// repackage
- Path srcP = source.resolve("src");
Files.walkFileTree(srcP, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
jarOut.putNextEntry(new JarEntry("OSGI-OPT/src/" + srcP.relativize(file).toString()));
- Files.copy(file, jarOut);
+ if (!Files.isDirectory(file))
+ Files.copy(file, jarOut);
return FileVisitResult.CONTINUE;
}
});
+
}
}
* Recursively find the base source directory (which contains the
* <code>{@value #SDK_MK}</code> file).
*/
- private Path findSdkMk(Path directory) {
+ Path findSdkMk(Path directory) {
Path sdkMkP = directory.resolve(SDK_MK);
if (Files.exists(sdkMkP)) {
return sdkMkP.toAbsolutePath();
return findSdkMk(directory.getParent());
}
+ /**
+ * Reads Makefile variable assignments of the form =, :=, or ?=, ignoring white
+ * spaces. To be used with very simple included Makefiles only.
+ */
+ Map<String, String> readeMakefileVariables(Path path) throws IOException {
+ Map<String, String> context = new HashMap<>();
+ List<String> sdkMkLines = Files.readAllLines(path);
+ lines: for (String line : sdkMkLines) {
+ StringTokenizer st = new StringTokenizer(line, " :=?");
+ if (!st.hasMoreTokens())
+ continue lines;
+ String key = st.nextToken();
+ if (!st.hasMoreTokens())
+ continue lines;
+ String value = st.nextToken();
+ if (st.hasMoreTokens()) // probably not a simple variable assignment
+ continue lines;
+ context.put(key, value);
+ }
+ return context;
+ }
+
/** Main entry point, interpreting actions and arguments. */
public static void main(String... args) {
if (args.length == 0)
+ (jvmUptime % 1000) + " s");
} catch (Exception e) {
long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();
- logger.log(ERROR,
- "Make.java action '" + action + "' failed after " + (jvmUptime / 1000) + "." + (jvmUptime % 1000) + " s",
- e);
+ logger.log(ERROR, "Make.java action '" + action + "' failed after " + (jvmUptime / 1000) + "."
+ + (jvmUptime % 1000) + " s", e);
System.exit(1);
}
}
projects / cc0 / argeo-build.git / blobdiff