projects
/
cc0
/
argeo-build.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not compile bundles without src directory
[cc0/argeo-build.git]
/
src
/
org
/
argeo
/
build
/
Make.java
diff --git
a/src/org/argeo/build/Make.java
b/src/org/argeo/build/Make.java
index cfedf9a06912e5a74fcc4fd1ccd30315c5f81940..af624060d66eb9d95d1f26cd518e44442584843d 100644
(file)
--- 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.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;
import static java.lang.System.Logger.Level.WARNING;
import java.io.File;
@@
-226,7
+227,8
@@
public class Make {
}
// sources
}
// 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)) {
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);
}
} 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());
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");
if (logger.isLoggable(INFO))
compilerArgs.add("-time");