X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=4f22815f1d4cd5295c20823f309ebb3d080fc097;hb=db89cbf633f301c206628331ea61548ad739eea9;hp=ca5fc8e09e5434bef3db05857de9674a23287fae;hpb=4bbff43fd6fdc22e1f5083f667b773be8e82d544;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index ca5fc8e..4f22815 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -3,7 +3,6 @@ package org.argeo.build;
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.ERROR;
 import static java.lang.System.Logger.Level.INFO;
-import static java.lang.System.Logger.Level.TRACE;
 import static java.lang.System.Logger.Level.WARNING;
 
 import java.io.File;
@@ -510,6 +509,10 @@ public class Make {
 					for (PathMatcher exclude : excludes)
 						if (exclude.matches(relativeP))
 							return FileVisitResult.CONTINUE;
+					// skip JavaScript source maps
+					if (sourceBundles && file.getFileName().toString().endsWith(".map"))
+						return FileVisitResult.CONTINUE;
+
 					JarEntry entry = new JarEntry(relativeP.toString());
 					jarOut.putNextEntry(entry);
 					Files.copy(file, jarOut);
@@ -517,41 +520,43 @@ public class Make {
 				}
 			});
 
-			// Add all resources from src/
-			Files.walkFileTree(srcP, new SimpleFileVisitor<Path>() {
-				@Override
-				public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-					// skip directories ending with .js
-					// TODO find something more robust?
-					if (dir.getFileName().toString().endsWith(".js"))
-						return FileVisitResult.SKIP_SUBTREE;
-					return super.preVisitDirectory(dir, attrs);
-				}
+			if (Files.exists(srcP)) {
+				// Add all resources from src/
+				Files.walkFileTree(srcP, new SimpleFileVisitor<Path>() {
+					@Override
+					public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+						// skip directories ending with .js
+						// TODO find something more robust?
+						if (dir.getFileName().toString().endsWith(".js"))
+							return FileVisitResult.SKIP_SUBTREE;
+						return super.preVisitDirectory(dir, attrs);
+					}
 
-				@Override
-				public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-					if (file.getFileName().toString().endsWith(".java")
-							|| file.getFileName().toString().endsWith(".class"))
+					@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;
-					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) {
+					copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/");
 				}
-			});
+			}
 
 			// add legal notices and licenses
 			for (Path p : listLegalFilesToInclude(source).values()) {
 				jarOut.putNextEntry(new JarEntry(p.getFileName().toString()));
 				Files.copy(p, jarOut);
 			}
-
-			// add sources
-			// TODO add effective BND, Eclipse project file, etc., in order to be able to
-			// repackage
-			if (!sourceBundles) {
-				copySourcesToJar(srcP, jarOut, "OSGI-OPT/src/");
-			}
 		}
 
 		if (sourceBundles) {// create separate sources jar
@@ -564,15 +569,36 @@ public class Make {
 			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, "");
-				// add legal notices and licenses
-				for (Path p : listLegalFilesToInclude(source).values()) {
-					srcJarOut.putNextEntry(new JarEntry(p.getFileName().toString()));
-					Files.copy(p, srcJarOut);
+
+			boolean isJsBundle = bundleSymbolicName.endsWith(".js");
+			if (!isJsBundle) {
+				srcManifest.getMainAttributes().putValue("Eclipse-SourceBundle",
+						bundleSymbolicName + ";version=\"" + manifest.getMainAttributes().getValue("Bundle-Version"));
+
+				try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) {
+					copySourcesToJar(srcP, srcJarOut, "");
+					// add legal notices and licenses
+					for (Path p : listLegalFilesToInclude(source).values()) {
+						srcJarOut.putNextEntry(new JarEntry(p.getFileName().toString()));
+						Files.copy(p, srcJarOut);
+					}
+				}
+			} else {// JavaScript source maps
+				srcManifest.getMainAttributes().putValue("Fragment-Host",
+						bundleSymbolicName + ";version=\"" + manifest.getMainAttributes().getValue("Bundle-Version"));
+				try (JarOutputStream srcJarOut = new JarOutputStream(Files.newOutputStream(srcJarP), srcManifest)) {
+					Files.walkFileTree(source, new SimpleFileVisitor<Path>() {
+						@Override
+						public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+							Path relativeP = source.relativize(file);
+							if (!file.getFileName().toString().endsWith(".map"))
+								return FileVisitResult.CONTINUE;
+							JarEntry entry = new JarEntry(relativeP.toString());
+							srcJarOut.putNextEntry(entry);
+							Files.copy(file, srcJarOut);
+							return FileVisitResult.CONTINUE;
+						}
+					});
 				}
 			}
 		}