-
Bug
-
Resolution: Fixed
-
P4
-
9
Issue | Fix Version | Assignee | Priority | Status | Resolution | Resolved In Build |
---|---|---|---|---|---|---|
JDK-8215632 | openjdk8u212 | Arunprasad Rajkumar | P4 | Resolved | Fixed | master |
JDK-8215753 | 8u212 | Arunprasad Rajkumar | P4 | Resolved | Fixed | b01 |
JDK-8216013 | 8u211 | Kevin Rushforth | P4 | Resolved | Fixed | b01 |
diff -r 57de516bbbe8 build.gradle
--- a/build.gradle Thu Mar 10 07:53:00 2016 -0800
+++ b/build.gradle Fri Mar 11 17:12:45 2016 -0500
@@ -99,10 +99,6 @@
* Converts cygwin style paths to windows style paths, but with a forward slash.
* This method is safe to call from any platform, and will only do work if
* called on Windows (in all other cases it simply returns the supplied path.
- * In the future I would like to modify this so that it only does work if
- * cygwin is installed, as I hope one day to remove the requirement to build
- * with cygwin, but at present (due to GStreamer / Webkit) cygwin is needed
- * anyway.
*
* @param path the path to convert
* @return the path converted to windows style, if on windows, otherwise it
@@ -112,12 +108,9 @@
if (!IS_WINDOWS) return path;
if (path == null || "".equals(path)) return path;
ByteArrayOutputStream out = new ByteArrayOutputStream();
- logger.info("Converting path '$path' via cygpath")
- exec {
- standardOutput = out
- commandLine "cmd", "/c", "cygpath", "-m", path
- }
- return out.toString().trim();
+ String ret = path.replaceAll('\\\\', '/')
+ logger.info("Converting path '$path' via cygpath to "+ret)
+ return ret
}
void loadProperties(String sourceFileName) {
--- a/build.gradle Thu Mar 10 07:53:00 2016 -0800
+++ b/build.gradle Fri Mar 11 17:12:45 2016 -0500
@@ -99,10 +99,6 @@
* Converts cygwin style paths to windows style paths, but with a forward slash.
* This method is safe to call from any platform, and will only do work if
* called on Windows (in all other cases it simply returns the supplied path.
- * In the future I would like to modify this so that it only does work if
- * cygwin is installed, as I hope one day to remove the requirement to build
- * with cygwin, but at present (due to GStreamer / Webkit) cygwin is needed
- * anyway.
*
* @param path the path to convert
* @return the path converted to windows style, if on windows, otherwise it
@@ -112,12 +108,9 @@
if (!IS_WINDOWS) return path;
if (path == null || "".equals(path)) return path;
ByteArrayOutputStream out = new ByteArrayOutputStream();
- logger.info("Converting path '$path' via cygpath")
- exec {
- standardOutput = out
- commandLine "cmd", "/c", "cygpath", "-m", path
- }
- return out.toString().trim();
+ String ret = path.replaceAll('\\\\', '/')
+ logger.info("Converting path '$path' via cygpath to "+ret)
+ return ret
}
void loadProperties(String sourceFileName) {
- backported by
-
JDK-8215632 remove a cygwin dependency
-
- Resolved
-
-
JDK-8215753 remove a cygwin dependency
-
- Resolved
-
-
JDK-8216013 remove a cygwin dependency
-
- Resolved
-