aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tarasov <anton.tarasov@jetbrains.com>2017-04-17 11:50:22 +0300
committerAnton Tarasov <anton.tarasov@jetbrains.com>2017-04-17 11:50:22 +0300
commit7bf46d10005d02c4cb20f1fc38d1ff112f438f01 (patch)
tree24c10820dfa9a8e08c1e7690451a0d112adf52f6
parenteaa5e0711a43d64874111254d74893fa299d5716 (diff)
downloadjdk8u-7bf46d10005d02c4cb20f1fc38d1ff112f438f01.tar.gz
-rw-r--r--idea/java/build.gradle10
1 files changed, 8 insertions, 2 deletions
diff --git a/idea/java/build.gradle b/idea/java/build.gradle
index 7f22f9a..b45fd82 100644
--- a/idea/java/build.gradle
+++ b/idea/java/build.gradle
@@ -63,8 +63,14 @@ sourceSets.test.java.srcDirs = ["../../jdk/idea/java/tests/src"]
def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile
+def make_cmd = "make"
+if (OperatingSystem.current().isWindows()) {
+ def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
+ if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
+}
+
task make_images << {
- def pb = new ProcessBuilder().command("make", "-C", buildDir.absolutePath,
+ def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath,
" COMPILER_WARNINGS_FATAL=false", "images")
def proc = pb.redirectErrorStream(true).start()
proc.inputStream.eachLine {println it}
@@ -72,7 +78,7 @@ task make_images << {
}
task make_clean << {
- def pb = new ProcessBuilder().command("make", "-C", buildDir.absolutePath,
+ def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath,
" COMPILER_WARNINGS_FATAL=false", "clean")
def proc = pb.redirectErrorStream(true).start()
proc.inputStream.eachLine {println it}