Bug 271416 VersionNumberStripper fails with underscores in path
diff --git a/bundles/org.eclipse.build.tools/buildTools.jar b/bundles/org.eclipse.build.tools/buildTools.jar
index 5e5e878..b6a324c 100644
--- a/bundles/org.eclipse.build.tools/buildTools.jar
+++ b/bundles/org.eclipse.build.tools/buildTools.jar
Binary files differ
diff --git a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/VersionNumberStripper.java b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/VersionNumberStripper.java
index c2b7661..bea7263 100644
--- a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/VersionNumberStripper.java
+++ b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/VersionNumberStripper.java
@@ -53,16 +53,23 @@
File [] files = file.listFiles();
for (int i=0; i<files.length; i++){
- int underScorePos = files[i].getAbsolutePath().indexOf("_");
- int jarExtPos = files[i].getAbsolutePath().indexOf(".jar");
+ String absolutePath = files[i].getAbsolutePath();
+ String path = absolutePath.substring(0, absolutePath.length()
+ - files[i].getName().length());
+
+ int underScorePos = files[i].getName().indexOf("_");
+ int jarExtPos = files[i].getName().indexOf(".jar");
if (underScorePos != -1) {
- if (jarExtPos != -1)
- files[i].renameTo(new File((files[i].getAbsolutePath())
- .substring(0, underScorePos)
- + ".jar"));
- else
- files[i].renameTo(new File((files[i].getAbsolutePath())
- .substring(0, underScorePos)));
+ String targetPath;
+ if (jarExtPos != -1) {
+ targetPath =path
+ + files[i].getName().substring(0, underScorePos)
+ + ".jar";
+ } else {
+ targetPath = path
+ + files[i].getName().substring(0, underScorePos);
+ }
+ files[i].renameTo(new File(targetPath));
}
}
