[sourcekit] Enable installing both sourcekitdInProc and sourcekitd

Makes it possible to build and install both sourcekitdInProc and the XPC
service on Darwin.

Author: benlangmuir

tools/CMakeLists.txt

@@ -1,9 +1,7 @@
 include(CheckIncludeFiles)
 check_include_files("xpc/xpc.h" HAVE_XPC_H)
 
-swift_is_installing_component(sourcekit-inproc SOURCEKIT_INSTALLING_INPROC)
-
-if(HAVE_XPC_H AND SWIFT_BUILD_SOURCEKIT AND NOT SOURCEKIT_INSTALLING_INPROC)
+if(HAVE_XPC_H AND SWIFT_BUILD_SOURCEKIT)
   set(BUILD_SOURCEKIT_XPC_SERVICE TRUE)
 else()
   set(BUILD_SOURCEKIT_XPC_SERVICE FALSE)

tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt

@@ -3,6 +3,8 @@ set(EXPORTED_SYMBOL_FILE "${SOURCEKITD_SOURCE_DIR}/bin/sourcekitd.exports")
 option(SOURCEKITD_BUILD_STATIC_INPROC
   "Build sourcekitdInProc as a static library (in addition to a shared one)" OFF)
 
+swift_is_installing_component(sourcekit-inproc SOURCEKIT_INSTALLING_INPROC)
+
 set(sourcekitdInProc_args
   sourcekitdInProc.cpp
   LLVM_LINK_COMPONENTS support coverage
@@ -17,6 +19,11 @@ if (SOURCEKIT_INSTALLING_INPROC)
       INSTALL_IN_COMPONENT sourcekit-inproc
     )
     set_property(TARGET sourcekitdInProc APPEND_STRING PROPERTY LINK_FLAGS " -fapplication-extension")
+    if (SOURCEKIT_DEPLOYMENT_OS MATCHES "^macosx")
+      add_definitions(-DSOURCEKIT_VERSIONED_FRAMEWORK_BUNDLE)
+    else()
+      add_definitions(-DSOURCEKIT_UNVERSIONED_FRAMEWORK_BUNDLE)
+    endif()
   else()
     add_sourcekit_library(sourcekitdInProc
       ${sourcekitdInProc_args}

tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.cpp

@@ -45,20 +45,32 @@ static void getToolchainPrefixPath(llvm::SmallVectorImpl<char> &Path) {
   if (!GetModuleFileNameA(static_cast<HINSTANCE>(mbi.AllocationBase), path,
                           MAX_PATH))
     llvm_unreachable("call to GetModuleFileNameA failed");
-  auto parent =
-      llvm::sys::path::parent_path(llvm::sys::path::parent_path(path));
+  auto parent = llvm::sys::path::parent_path(path);
   Path.append(parent.begin(), parent.end());
 #else
   // This silly cast below avoids a C++ warning.
   Dl_info info;
   if (dladdr((void *)(uintptr_t)sourcekitd_initialize, &info) == 0)
     llvm_unreachable("Call to dladdr() failed");
-
   // We now have the path to the shared lib, move to the parent prefix path.
-  auto parent = llvm::sys::path::parent_path(
-      llvm::sys::path::parent_path(info.dli_fname));
+  auto parent = llvm::sys::path::parent_path(info.dli_fname);
   Path.append(parent.begin(), parent.end());
 #endif
+
+#if defined(SOURCEKIT_UNVERSIONED_FRAMEWORK_BUNDLE)
+  // Path points to e.g. "usr/lib/sourcekitdInProc.framework/"
+  const unsigned NestingLevel = 2;
+#elif defined(SOURCEKIT_VERSIONED_FRAMEWORK_BUNDLE)
+  // Path points to e.g. "usr/lib/sourcekitdInProc.framework/Versions/Current/"
+  const unsigned NestingLevel = 4;
+#else
+  // Path points to e.g. "usr/lib/"
+  const unsigned NestingLevel = 1;
+#endif
+
+  // Get it to "usr"
+  for (unsigned i = 0; i < NestingLevel; ++i)
+    llvm::sys::path::remove_filename(Path);
 }
 
 static std::string getRuntimeLibPath() {

tools/SourceKit/tools/sourcekitd/bin/XPC/Service/CMakeLists.txt

@@ -1,4 +1,4 @@
-if (NOT SOURCEKIT_INSTALLING_INPROC)
+if (BUILD_SOURCEKIT_XPC_SERVICE)
   add_sourcekit_xpc_service(SourceKitService sourcekitd
     XPCService.cpp
     LLVM_LINK_COMPONENTS support coverage