X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FMake.java;h=88036dae82e471eee78f7f71938bc598467ddbb8;hb=177b83d97d5f533ed7b3f1a2b1670789d467c3dc;hp=af624060d66eb9d95d1f26cd518e44442584843d;hpb=72a758a0ed344a5d0845e8bbd3b74d4b9f1b9bb6;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index af62406..88036da 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;
@@ -241,7 +240,7 @@ public class Make {
 			}
 			Path bundleSrc = bundlePath.resolve("src");
 			if (!Files.exists(bundleSrc)) {
-				logger.log(TRACE, bundleSrc + " does not exist, skipping it, as this is not a Java bundle");
+				logger.log(WARNING, bundleSrc + " does not exist, skipping it, as this is not a Java bundle");
 				continue bundles;
 			}
 			sb.append(bundleSrc);
@@ -510,6 +509,10 @@ public class Make {
 					for (PathMatcher exclude : excludes)
 						if (exclude.matches(relativeP))
 							return FileVisitResult.CONTINUE;
+					// skip JavaScript source maps
+					if (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