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

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 6f84344..0da82b0 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -31,6 +31,7 @@ import java.util.concurrent.CompletableFuture;
 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;
 
@@ -232,7 +233,8 @@ public class Make {
 		}
 
 		// Normalise
-		properties.put("Bundle-SymbolicName", bundleSymbolicName);
+		if (!properties.containsKey("Bundle-SymbolicName"))
+			properties.put("Bundle-SymbolicName", bundleSymbolicName);
 
 		// Calculate MANIFEST
 		Path binP = compiled.resolve("bin");
@@ -275,6 +277,7 @@ public class Make {
 		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
@@ -310,10 +313,24 @@ public class Make {
 				}
 			});
 
+			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 {
@@ -323,6 +340,7 @@ public class Make {
 					return FileVisitResult.CONTINUE;
 				}
 			});
+
 		}
 	}