projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
405cc54
)
Revert deleting existing directories from failed builds
author
Mathieu Baudier <mbaudier@argeo.org>
Thu, 16 Mar 2023 09:16:28 +0000
(10:16 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Thu, 16 Mar 2023 09:16:28 +0000
(10:16 +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 35979c01a90e381d504c5f45d3dd90f5caa71b70..54863afa942e8f4e69a554767f36e0d7408b8a08 100644
(file)
--- 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());
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) {
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");
? 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())
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");
? 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())
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());
}
}
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());
// force Java 9 module name
entries.put(ManifestConstants.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());