Skip to content

Commit 656d105

Browse files
committed
7902686: Jasm incorrectly sets up the SourceFile attribute on Windows platform
1 parent a76f4d2 commit 656d105

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build/productinfo.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
PRODUCT_NAME = asmtools
2727
PRODUCT_JAR_NAME = asmtools.jar
2828
PRODUCT_VERSION = 7.0
29-
PRODUCT_MILESTONE = beta
30-
PRODUCT_BUILDNUMBER = b02
29+
PRODUCT_MILESTONE = ea
30+
PRODUCT_BUILDNUMBER = b09
3131
PRODUCT_NAME_LONG = Java Assembler Tools

src/org/openjdk/asmtools/jasm/Environment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.openjdk.asmtools.util.I18NResourceBundle;
2828

2929
import java.io.*;
30+
import java.nio.file.Paths;
3031
import java.text.MessageFormat;
3132

3233
/**
@@ -94,9 +95,7 @@ public String getInputFileName() {
9495

9596
public String getSimpleInputFileName() {
9697
if( simpleInputFileName == null ) {
97-
char separatorChar = (inputFileName.matches("^[A-Za-z]+:.*")) ? '/' : File.separatorChar;
98-
int index = inputFileName.lastIndexOf(separatorChar);
99-
simpleInputFileName = (index < 0) ? inputFileName.substring(0) : inputFileName.substring(index + 1);
98+
simpleInputFileName = Paths.get(inputFileName).getFileName().toString();
10099
}
101100
return simpleInputFileName;
102101
}

0 commit comments

Comments
 (0)