From ef7f688cff110bce53ad84357f9fd33fa819f8ae Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 16 Mar 2023 10:16:28 +0100 Subject: [PATCH] Revert deleting existing directories from failed builds --- src/org/argeo/build/Repackage.java | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 35979c0..54863af 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -325,12 +325,6 @@ public class Repackage { CategoryNameVersion nameVersion = new M2Artifact(category + ":" + bundleSymbolicName + ":" + m2Version); Path targetBundleDir = targetCategoryBase.resolve(bundleSymbolicName + "." + nameVersion.getBranch()); - if (Files.exists(targetBundleDir)) { - logger.log(WARNING, targetBundleDir + " exists, deleting it..."); - deleteDirectory(targetBundleDir); - } else { - Files.createDirectories(targetBundleDir); - } String[] artifacts = artifactsStr.split(","); artifacts: for (String str : artifacts) { @@ -534,14 +528,7 @@ public class Repackage { ? targetBundleDir.getParent().resolve(targetBundleDir.toString() + ".src") : targetBundleDir.resolve("OSGI-OPT/src"); - if (Files.exists(targetSourceDir) && sourceBundles) { - logger.log(WARNING, targetSourceDir + " exists, deleting it..."); - deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries + Files.createDirectories(targetSourceDir); JarEntry entry; entries: while ((entry = jarIn.getNextJarEntry()) != null) { if (entry.isDirectory()) @@ -689,14 +676,7 @@ public class Repackage { ? targetBundleDir.getParent().resolve(targetBundleDir.toString() + ".src") : targetBundleDir.resolve("OSGI-OPT/src"); - if (Files.exists(targetSourceDir) && sourceBundles) { - logger.log(WARNING, targetSourceDir + " exists, deleting it..."); - deleteDirectory(targetSourceDir); - } else { - Files.createDirectories(targetSourceDir); - } - - // copy entries + Files.createDirectories(targetSourceDir); JarEntry entry; entries: while ((entry = jarIn.getNextJarEntry()) != null) { if (entry.isDirectory()) @@ -759,12 +739,6 @@ public class Repackage { } } targetBundleDir = targetBase.resolve(nameVersion.getName() + "." + nameVersion.getBranch()); - if (Files.exists(targetBundleDir)) { - logger.log(WARNING, targetBundleDir + " exists, deleting it..."); - deleteDirectory(targetBundleDir); - } else { - Files.createDirectories(targetBundleDir); - } // force Java 9 module name entries.put(ManifestConstants.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName()); -- 2.30.2