DevKit: IDEA-128345 Can't create plugin SDK on OS X + friendly sdk na…

…me for CLion
ezhaka · Sep 3, 2014 · c633f5c · c633f5c
1 parent 620027a
commit c633f5c
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java
@@ -86,6 +86,15 @@ public String suggestHomePath() {
     return PathManager.getHomePath().replace(File.separatorChar, '/');
   }
 
+  @Override
+  public String adjustSelectedSdkHome(String homePath) {
+    if (SystemInfo.isMac) {
+      File home = new File(homePath, "Contents");
+      if (home.exists()) return home.getPath();
+    }
+    return super.adjustSelectedSdkHome(homePath);
+  }
+
   public boolean isValidSdkHome(String path) {
     if (isFromIDEAProject(path)) {
       return true;
@@ -153,6 +162,9 @@ else if (new File(sdkHome, "lib/webide.jar").exists()) {
     else if (new File(sdkHome, "license/AppCode_license.txt").exists()) {
       productName = "AppCode ";
     }
+    else if (new File(sdkHome, "license/CLion_Preview_License.txt").exists()) {
+      productName = "CLion ";
+    }
     else {
       productName = "IDEA ";
     }