From 4dd267795c0b9f156d6698c61a7d55a95ec66b52 Mon Sep 17 00:00:00 2001
From: Anton Tarasov <anton.tarasov@jetbrains.com>
Date: Thu, 19 Jan 2017 15:09:50 +0300
Subject: Correct gradle project

---
 idea/java/.idea/vcs.xml |  1 +
 idea/java/build.gradle  | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/idea/java/.idea/vcs.xml b/idea/java/.idea/vcs.xml
index ff8494b..cdeb408 100644
--- a/idea/java/.idea/vcs.xml
+++ b/idea/java/.idea/vcs.xml
@@ -7,6 +7,7 @@
     <mapping directory="$PROJECT_DIR$/../../jaxp" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../../jaxws" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../../jdk" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../langtools" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../../nashorn" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/idea/java/build.gradle b/idea/java/build.gradle
index a8a40cb..7f22f9a 100644
--- a/idea/java/build.gradle
+++ b/idea/java/build.gradle
@@ -42,13 +42,22 @@ ant.importBuild('../../jdk/idea/java/tests/perf_tests.xml') { antTargetName ->
 ant.properties.test_jvm = test_jvm()
 
 println ant.properties.test_jvm
-sourceSets.main.java.srcDirs =
+
+if (OperatingSystem.current().isMacOsX())
+    sourceSets.main.java.srcDirs =
         ["../../jdk/src/share/classes",
          "../../jdk/src/macosx/classes",
-         "../../jdk/src/windows/classes",
+        ]
+else if (OperatingSystem.current().isLinux())
+    sourceSets.main.java.srcDirs =
+        ["../../jdk/src/share/classes",
          "../../jdk/src/solaris/classes"
         ]
-
+else
+    sourceSets.main.java.srcDirs =
+        ["../../jdk/src/share/classes",
+         "../../jdk/src/windows/classes",
+        ]
 
 sourceSets.test.java.srcDirs = ["../../jdk/idea/java/tests/src"]
 
-- 
cgit v1.2.3