import java.util.StringJoiner;
import java.util.StringTokenizer;
import java.util.concurrent.CompletableFuture;
+import java.util.jar.Attributes;
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;
public class Make {
private final static Logger logger = System.getLogger(Make.class.getName());
+ /**
+ * Environment properties on whether sources should be packaged separately or
+ * integrated in the bundles.
+ */
+ private final static String ENV_BUILD_SOURCE_BUNDLES = "BUILD_SOURCE_BUNDLES";
+
/** 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;
/** The base of the a2 output for all layers. */
final Path a2Output;
+ /** Whether sources should be packaged separately */
+ final boolean sourceBundles;
+
/** Constructor initialises the base directories. */
public Make() throws IOException {
+ sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
+ if (sourceBundles)
+ logger.log(Level.INFO, "Sources will be packaged separately");
+
execDirectory = Paths.get(System.getProperty("user.dir"));
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();
for (Path jarP : Files.newDirectoryStream(a2Dir,
(p) -> p.getFileName().toString().endsWith(".jar"))) {
classPath.add(jarP.toString());
- System.out.println(jarP);
}
}
}
}
/** 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");
throw new IllegalArgumentException("One and only one --category must be specified");
String category = categories.get(0);
- List<String> branches = options.get("--branch");
- if (branches.size() != 1)
- throw new IllegalArgumentException("One and only one --branch must be specified");
- String branch = branches.get(0);
+ final String branch;
+ Path branchMk = sdkSrcBase.resolve(BRANCH_MK);
+ if (Files.exists(branchMk)) {
+ Map<String, String> branchVariables = readeMakefileVariables(branchMk);
+ branch = branchVariables.get("BRANCH");
+ } else {
+ branch = null;
+ }
long begin = System.currentTimeMillis();
// create jars in parallel
properties.load(in);
}
- Path branchBnd = sdkSrcBase.resolve("sdk/branches/" + branch + ".bnd");
- try (InputStream in = Files.newInputStream(branchBnd)) {
- properties.load(in);
+ if (branch != null) {
+ Path branchBnd = sdkSrcBase.resolve("sdk/branches/" + branch + ".bnd");
+ if (Files.exists(branchBnd))
+ try (InputStream in = Files.newInputStream(branchBnd)) {
+ properties.load(in);
+ }
}
Path bndBnd = source.resolve("bnd.bnd");
- try (InputStream in = Files.newInputStream(bndBnd)) {
- properties.load(in);
- }
+ if (Files.exists(bndBnd))
+ try (InputStream in = Files.newInputStream(bndBnd)) {
+ properties.load(in);
+ }
// Normalise
- properties.put("Bundle-SymbolicName", bundleSymbolicName);
+ if (!properties.containsKey("Bundle-SymbolicName"))
+ properties.put("Bundle-SymbolicName", bundleSymbolicName);
// Calculate MANIFEST
Path binP = compiled.resolve("bin");
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
}
});
- // add sources
- // TODO add effective BND, Eclipse project file, etc., in order to be able to
- // repackage
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 {
- jarOut.putNextEntry(new JarEntry("OSGI-OPT/src/" + srcP.relativize(file).toString()));
+ 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
+ if (sourceBundles) {
+ Path srcJarP = a2JarDirectory.resolve(compiled.getFileName() + "." + major + "." + minor + ".src.jar");
+ Manifest srcManifest = new Manifest();
+ srcManifest.getMainAttributes().put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ 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, "");
+ }
+ } else {
+ copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/");
+ }
}
}
+ void copySourcesToJar(Path srcP, JarOutputStream srcJarOut, String prefix) throws IOException {
+ Files.walkFileTree(srcP, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+ srcJarOut.putNextEntry(new JarEntry(prefix + srcP.relativize(file).toString()));
+ if (!Files.isDirectory(file))
+ Files.copy(file, srcJarOut);
+ 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)
projects / cc0 / argeo-build.git / blobdiff