From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 Sep 2023 04:21:38 +0000 (+0200)
Subject: Do not compile bundles without src directory
X-Git-Tag: v2.3.8~23
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=72a758a0ed344a5d0845e8bbd3b74d4b9f1b9bb6

Do not compile bundles without src directory
---

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index cfedf9a..af62406 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -3,6 +3,7 @@ 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;
@@ -226,7 +227,8 @@ public class Make {
 		}
 
 		// sources
-		for (String bundle : bundles) {
+		boolean atLeastOneBundleToCompile = false;
+		bundles: for (String bundle : bundles) {
 			StringBuilder sb = new StringBuilder();
 			Path bundlePath = execDirectory.resolve(bundle);
 			if (!Files.exists(bundlePath)) {
@@ -237,15 +239,24 @@ public class Make {
 				} else
 					throw new IllegalArgumentException("Bundle " + bundle + " not found in " + execDirectory);
 			}
-			sb.append(bundlePath.resolve("src"));
+			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");
+				continue bundles;
+			}
+			sb.append(bundleSrc);
 			sb.append("[-d");
 			compilerArgs.add(sb.toString());
 			sb = new StringBuilder();
 			sb.append(buildBase.resolve(bundle).resolve("bin"));
 			sb.append("]");
 			compilerArgs.add(sb.toString());
+			atLeastOneBundleToCompile = true;
 		}
 
+		if (!atLeastOneBundleToCompile)
+			return;
+
 		if (logger.isLoggable(INFO))
 			compilerArgs.add("-time");