gradle project: mapped make targets on standard gradle onesjb8u112-b499

1 files changed, 13 insertions, 8 deletions

diff --git a/idea/java/build.gradle b/idea/java/build.gradle
index 0a19c4b..fb185f2 100644
--- a/idea/java/build.gradle
+++ b/idea/java/build.gradle
@@ -10,23 +10,28 @@ sourceSets.main.java.srcDirs =
          "../../jdk/src/windows/classes",
          "../../jdk/src/solaris/classes"]
 
+
+
 def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile
 def makeCmd = "make -C " + buildDir + " COMPILER_WARNINGS_FATAL=false"
+def makeImagesCmd = makeCmd + " images"
+def makeCleanCmd = makeCmd + " clean"
 
-defaultTasks 'images'
 
-task images << {
-    println makeCmd + " images"
-    def proc = makeCmd.execute()
+task make_images << {
+    def proc = makeImagesCmd.execute()
     proc.consumeProcessOutput(out, err)
     proc.waitFor()
     assert proc.exitValue() == 0
 }
 
-task clean << {
-    println makeCmd + " clean"
-    def proc = makeCmd.execute()
+task make_clean << {
+    def proc = makeCleanCmd.execute()
     proc.consumeProcessOutput(out, err)
     proc.waitFor()
     assert proc.exitValue() == 0
-}
\ No newline at end of file
+}
+
+tasks.compileJava.enabled = false
+classes.dependsOn tasks.make_images
+tasks.cleanClasses.dependsOn tasks.make_clean