X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=4d9caf93145e8bc717bf90c415519896a9cf174b;hb=3bf6a139f456ff71bec3bc61d8cd14a1d058133a;hp=beacf017ed4a68bd13e68fc78f5146020d6342cb;hpb=d99c3c1e21b923f9a52fad75dd1e163c8dc553d1;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index beacf01..4d9caf9 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;
@@ -82,9 +83,13 @@ public class Make {
 
 	/** 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");
+		if (System.getenv(ENV_BUILD_SOURCE_BUNDLES) != null) {
+			sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
+			if (sourceBundles)
+				logger.log(Level.INFO, "Sources will be packaged separately");
+		} else {
+			sourceBundles = true;
+		}
 
 		execDirectory = Paths.get(System.getProperty("user.dir"));
 		Path sdkMkP = findSdkMk(execDirectory);
@@ -351,21 +356,36 @@ public class Make {
 			// TODO add effective BND, Eclipse project file, etc., in order to be able to
 			// repackage
 			if (sourceBundles) {
-				// TODO package sources separately
+				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 {
-				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;
-					}
-				});
+				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).