1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
|
Description: Makes the generated module-info.java files reproducible (removes a captured build path)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/make/jdk/src/classes/build/tools/module/GenModuleInfoSource.java
+++ b/make/jdk/src/classes/build/tools/module/GenModuleInfoSource.java
@@ -156,9 +156,10 @@
if (l.trim().startsWith("module ")) {
if (debug) {
// print URI rather than file path to avoid escape
- writer.format(" // source file: %s%n", sourceFile.toUri());
+ String buildPath = System.getProperty("user.dir").replaceAll("make$", "");
+ writer.format(" // source file: %s%n", sourceFile.toUri().toString().replace(buildPath, ""));
for (Path file : extraFiles) {
- writer.format(" // %s%n", file.toUri());
+ writer.format(" // %s%n", file.toUri().toString().replace(buildPath, ""));
}
}
break;
|