From 02cad44ed0bd3929ef5d6deb175b1673f5096e3f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 14 Sep 2023 06:33:39 +0200 Subject: [PATCH] Delete previous failed builds --- src/org/argeo/build/Repackage.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 18b1487..c3fbcaf 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -1028,7 +1028,14 @@ public class Repackage { nameVersion.setName(ourSymbolicName); } } + + // create bundle dir bundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch()); + if (Files.exists(bundleDir)) { + logger.log(WARNING, "Bundle dir " + bundleDir + + " already exists, probably from a previous failed build, deleting it..."); + deleteDirectory(bundleDir); + } // copy original MANIFEST if (sourceManifest != null) { @@ -1053,7 +1060,6 @@ public class Repackage { arch = libRelativePath.getName(1).toString(); } -// if (!embed) { // copy entries JarEntry entry; entries: while ((entry = jarIn.getNextJarEntry()) != null) { @@ -1120,7 +1126,6 @@ public class Repackage { origin.deleted.add(bundleDir.relativize(target).toString()); } logger.log(TRACE, () -> "Copied " + target); -// } } } @@ -1133,11 +1138,6 @@ public class Repackage { entries.get(BUNDLE_SYMBOLICNAME.toString()) + ";singleton:=true"); } -// if (embed) {// copy embedded jar -// Files.copy(file, bundleDir.resolve(file.getFileName())); -// entries.put(ManifestHeader.BUNDLE_CLASSPATH.toString(), file.getFileName().toString()); -// } - // Final MANIFEST decisions // We also check the original OSGi metadata and compare with our changes for (String key : entries.keySet()) { -- 2.30.2