projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b901c7c
)
Improve logging
author
Mathieu Baudier <mbaudier@argeo.org>
Fri, 17 Mar 2023 05:41:59 +0000
(06:41 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Fri, 17 Mar 2023 05:41:59 +0000
(06:41 +0100)
src/org/argeo/build/Make.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Make.java
b/src/org/argeo/build/Make.java
index 782cfed024bd0af26af1cd359018d5e41d95cc9c..b2fb7d24807de1081cbe463baddb6adf0a2abe3f 100644
(file)
--- a/
src/org/argeo/build/Make.java
+++ b/
src/org/argeo/build/Make.java
@@
-1,5
+1,6
@@
package org.argeo.build;
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.ERROR;
import static java.lang.System.Logger.Level.INFO;
@@
-143,16
+144,15
@@
public class Make {
// and order by bundle name, for predictability
Map<String, A2Jar> a2Jars = new TreeMap<>();
// and order by bundle name, for predictability
Map<String, A2Jar> a2Jars = new TreeMap<>();
-
StringJoiner modulePath = new StringJoiner(File.pathSeparator);
+
//
StringJoiner modulePath = new StringJoiner(File.pathSeparator);
for (String a2Base : a2Bases) {
categories: for (String a2Category : a2Categories) {
Path a2Dir = Paths.get(a2Base).resolve(a2Category);
if (!Files.exists(a2Dir))
continue categories;
for (String a2Base : a2Bases) {
categories: for (String a2Category : a2Categories) {
Path a2Dir = Paths.get(a2Base).resolve(a2Category);
if (!Files.exists(a2Dir))
continue categories;
-
modulePath.add(a2Dir.toString());
+
//
modulePath.add(a2Dir.toString());
for (Path jarP : Files.newDirectoryStream(a2Dir,
(p) -> p.getFileName().toString().endsWith(".jar"))) {
for (Path jarP : Files.newDirectoryStream(a2Dir,
(p) -> p.getFileName().toString().endsWith(".jar"))) {
- // classPath.add(jarP.toString());
A2Jar a2Jar = new A2Jar(jarP);
if (a2Jars.containsKey(a2Jar.name)) {
A2Jar current = a2Jars.get(a2Jar.name);
A2Jar a2Jar = new A2Jar(jarP);
if (a2Jars.containsKey(a2Jar.name)) {
A2Jar current = a2Jars.get(a2Jar.name);
@@
-197,8
+197,11
@@
public class Make {
if (logger.isLoggable(INFO))
compilerArgs.add("-time");
if (logger.isLoggable(INFO))
compilerArgs.add("-time");
-// for (String arg : compilerArgs)
-// System.out.println(arg);
+ if (logger.isLoggable(DEBUG)) {
+ logger.log(DEBUG, "Compiler arguments:");
+ for (String arg : compilerArgs)
+ logger.log(DEBUG, arg);
+ }
boolean success = org.eclipse.jdt.core.compiler.batch.BatchCompiler.compile(
compilerArgs.toArray(new String[compilerArgs.size()]), new PrintWriter(System.out),
boolean success = org.eclipse.jdt.core.compiler.batch.BatchCompiler.compile(
compilerArgs.toArray(new String[compilerArgs.size()]), new PrintWriter(System.out),