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

7 files changed, 74 insertions, 10 deletions

diff --git a/idea/java/.idea/gradle.xml b/idea/java/.idea/gradle.xml
new file mode 100644
index 0000000..5f767b9
--- /dev/null
+++ b/idea/java/.idea/gradle.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="JBSDK" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/java/.idea/misc.xml b/idea/java/.idea/misc.xml
new file mode 100644
index 0000000..c221fde
--- /dev/null
+++ b/idea/java/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="JBSDK" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/idea/java/.idea/modules.xml b/idea/java/.idea/modules.xml
new file mode 100644
index 0000000..ba5592c
--- /dev/null
+++ b/idea/java/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java.iml" filepath="$PROJECT_DIR$/.idea/modules/java.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/java/.idea/modules/java.iml b/idea/java/.idea/modules/java.iml
new file mode 100644
index 0000000..8f4fe4e
--- /dev/null
+++ b/idea/java/.idea/modules/java.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="java" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../jdk/src/macosx">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/macosx/classes" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../jdk/src/share">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/share/classes" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../jdk/src/solaris">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/solaris/classes" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../jdk/src/windows">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../jdk/src/windows/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/java/.idea/runConfigurations/make_clean.xml b/idea/java/.idea/runConfigurations/make_clean.xml
index 27af19b..bce98e6 100644
--- a/idea/java/.idea/runConfigurations/make_clean.xml
+++ b/idea/java/.idea/runConfigurations/make_clean.xml
@@ -3,7 +3,7 @@
     <module name="java" />
     <setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
     <setting name="vmparams" value="" />
-    <setting name="params" value="-q clean" />
+    <setting name="params" value="-q make_clean" />
     <setting name="workDir" value="file://$PROJECT_DIR$" />
     <setting name="debug" value="false" />
     <method>
diff --git a/idea/java/.idea/runConfigurations/make_images.xml b/idea/java/.idea/runConfigurations/make_images.xml
index 0b1cd45..ec5fbae 100644
--- a/idea/java/.idea/runConfigurations/make_images.xml
+++ b/idea/java/.idea/runConfigurations/make_images.xml
@@ -3,7 +3,7 @@
     <module name="java" />
     <setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
     <setting name="vmparams" value="" />
-    <setting name="params" value="-q images" />
+    <setting name="params" value="-q make_images" />
     <setting name="workDir" value="file://$PROJECT_DIR$" />
     <setting name="debug" value="false" />
     <method>
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