X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=56230ea5fb9444634b5b0c9ab843b002b65983c4;hb=3714839e09d67535491b15ef560b2cb3fdf482db;hp=0da82b0cab00677432c497077740dca741abee9d;hpb=a035c5f7a8550c6392a1a2b0686c8d5cc9a97836;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 0da82b0..56230ea 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -28,6 +28,7 @@ import java.util.Properties;
 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;
@@ -50,6 +51,12 @@ import aQute.bnd.osgi.Jar;
 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). */
@@ -71,8 +78,15 @@ public class Make {
 	/** 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);
@@ -182,12 +196,14 @@ public class Make {
 			throw new IllegalArgumentException("One and only one --category must be specified");
 		String category = categories.get(0);
 
+		final String branch;
 		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");
+		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
@@ -222,15 +238,19 @@ public class Make {
 			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
 		if (!properties.containsKey("Bundle-SymbolicName"))
@@ -331,19 +351,37 @@ public class Make {
 			// add sources
 			// TODO add effective BND, Eclipse project file, etc., in order to be able to
 			// repackage
-			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 (!Files.isDirectory(file))
-						Files.copy(file, jarOut);
-					return FileVisitResult.CONTINUE;
+			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).