diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2017-02-17 09:07:57 -0800 |
|---|---|---|
| committer | Raluca Sauciuc <ralucas@google.com> | 2017-02-17 09:07:57 -0800 |
| commit | be3d836d2f975cea1e6ed6e9b95e1d665445db07 (patch) | |
| tree | b3f3092ff8727e8677ffe7a96961da3095ac2512 | |
| parent | 07b8e2007d1dd6504181a94d3af970facf3514e1 (diff) | |
| parent | 4dd267795c0b9f156d6698c61a7d55a95ec66b52 (diff) | |
| download | jdk8u-be3d836d2f975cea1e6ed6e9b95e1d665445db07.tar.gz | |
Merge 'jetbrains-master-mirror' into studio-master-dev
| -rw-r--r-- | idea/java/.idea/vcs.xml | 1 | ||||
| -rw-r--r-- | 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"] |