projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db89cbf
)
Fix clean of failed builds
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 14 Sep 2023 05:22:07 +0000
(07:22 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 14 Sep 2023 05:22:07 +0000
(07:22 +0200)
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 310c6ca186bc974eecf72ba1c9ace6adc5269f86..d33a55eea1f6aa35aedc9e8e7e1ceee583e5e89d 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-99,7
+99,7
@@
public class Repackage {
List<CompletableFuture<Void>> toDos = new ArrayList<>();
for (int i = 1; i < args.length; i++) {
Path categoryPath = Paths.get(args[i]);
List<CompletableFuture<Void>> toDos = new ArrayList<>();
for (int i = 1; i < args.length; i++) {
Path categoryPath = Paths.get(args[i]);
- cleanPreviousFailedBuild(categoryPath);
+
factory.
cleanPreviousFailedBuild(categoryPath);
if (sequential) // sequential processing happens here
factory.processCategory(categoryPath);
else
if (sequential) // sequential processing happens here
factory.processCategory(categoryPath);
else
@@
-117,10
+117,11
@@
public class Repackage {
}
/** Deletes remaining sub directories. */
}
/** Deletes remaining sub directories. */
- static void cleanPreviousFailedBuild(Path categoryPath) {
+ void cleanPreviousFailedBuild(Path categoryPath) {
+ Path outputCategoryPath = a2Base.resolve(categoryPath);
// clean previous failed build
try {
// clean previous failed build
try {
- for (Path subDir : Files.newDirectoryStream(
c
ategoryPath, (d) -> Files.isDirectory(d))) {
+ for (Path subDir : Files.newDirectoryStream(
outputC
ategoryPath, (d) -> Files.isDirectory(d))) {
if (Files.exists(subDir)) {
logger.log(WARNING, "Bundle dir " + subDir
+ " already exists, probably from a previous failed build, deleting it...");
if (Files.exists(subDir)) {
logger.log(WARNING, "Bundle dir " + subDir
+ " already exists, probably from a previous failed build, deleting it...");