projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c67267
)
Workaround for badly formatted jar
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 7 Oct 2023 05:01:48 +0000
(07:01 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 7 Oct 2023 05:01:48 +0000
(07:01 +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 7f11f21953d6f055f916edb0e982943a38835637..4dc604232b6ada170fe3bd045b41e855ee67b7b5 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-1048,8
+1048,10
@@
public class Repackage {
if (nameVersion == null) {
// hack for weird issue with JNA jar in Eclipse
String[] arr_ = file.getFileName().toString().split("_");
if (nameVersion == null) {
// hack for weird issue with JNA jar in Eclipse
String[] arr_ = file.getFileName().toString().split("_");
+ ourSymbolicName = arr_[0];
String v = arr_[1].substring(0, arr_[1].length() - 4);// remove .jar
String v = arr_[1].substring(0, arr_[1].length() - 4);// remove .jar
- nameVersion = new NameVersion(arr_[0], v);
+ entries.put(BUNDLE_VERSION.toString(), v);
+ nameVersion = new NameVersion(ourSymbolicName, v);
logger.log(WARNING, file + " has no symbolic name, trying " + nameVersion.getName() + "/"
+ nameVersion.getVersion() + " based on its name");
}
logger.log(WARNING, file + " has no symbolic name, trying " + nameVersion.getName() + "/"
+ nameVersion.getVersion() + " based on its name");
}