projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a732af
)
Improve logging
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 18 Mar 2023 07:35:25 +0000
(08:35 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 18 Mar 2023 07:35:25 +0000
(08:35 +0100)
src/org/argeo/build/Repackage.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Repackage.java
b/src/org/argeo/build/Repackage.java
index 1b2d6d1d8e7af3d440236dca2c431b37fb8ae42b..2df1aa33e99769be5b663ea5f52520d8505a61b8 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-75,6
+75,7
@@
public class Repackage {
final static boolean parallel = true;
// cache
final static boolean parallel = true;
// cache
+ /** Summary of all license seen during the repackaging. */
final static Map<String, Set<String>> licensesUsed = new TreeMap<>();
/** Main entry point. */
final static Map<String, Set<String>> licensesUsed = new TreeMap<>();
/** Main entry point. */
@@
-101,7
+102,7
@@
public class Repackage {
StringBuilder sb = new StringBuilder();
for (String licenseId : licensesUsed.keySet())
for (String name : licensesUsed.get(licenseId))
StringBuilder sb = new StringBuilder();
for (String licenseId : licensesUsed.keySet())
for (String name : licensesUsed.get(licenseId))
- sb.append(licenseId + "\t" + name + "\n");
+ sb.append(licenseId + "\t
\t\t
" + name + "\n");
logger.log(INFO, "# License summary:\n" + sb);
}
logger.log(INFO, "# License summary:\n" + sb);
}
@@
-889,7
+890,7
@@
public class Repackage {
} else {
if (!licensesUsed.containsKey(spdxLicenceId))
licensesUsed.put(spdxLicenceId, new TreeSet<>());
} else {
if (!licensesUsed.containsKey(spdxLicenceId))
licensesUsed.put(spdxLicenceId, new TreeSet<>());
- licensesUsed.get(spdxLicenceId).add(
file.getFileName()
.toString());
+ licensesUsed.get(spdxLicenceId).add(
nameVersion
.toString());
}
try (OutputStream out = Files.newOutputStream(manifestPath)) {
}
try (OutputStream out = Files.newOutputStream(manifestPath)) {