[sourcekit] Add the version to the XPC service identifier so that it can be distinct amongst multiple toolchains.

rdar://24292112

Author: akyrtzi

tools/SourceKit/CMakeLists.txt

@@ -388,7 +388,7 @@ macro(add_sourcekit_xpc_service name framework_target)
   endif()
 
   set(XPCSERVICE_NAME ${name})  
-  set(XPCSERVICE_IDENTIFIER "com.apple.${name}")  
+  set(XPCSERVICE_IDENTIFIER "${name}.${SOURCEKIT_VERSION_STRING}")
   set(XPCSERVICE_BUNDLE_VERSION "${SOURCEKIT_VERSION_STRING}")
   set(XPCSERVICE_SHORT_VERSION_STRING "1.0")
   configure_file(

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

@@ -16,6 +16,8 @@ add_sourcekit_framework(sourcekitd
   INSTALL_IN_COMPONENT sourcekit-xpc-service
 )
 
+add_definitions(-DSOURCEKIT_XPCSERVICE_IDENTIFIER="SourceKitService.${SOURCEKIT_VERSION_STRING}")
+
 if (SOURCEKIT_BUILT_STANDALONE)
   # Create the symlink necessary to find the swift stdlib.
   add_custom_command(TARGET sourcekitd POST_BUILD

tools/SourceKit/tools/sourcekitd/bin/XPC/Client/sourcekitd.cpp

@@ -251,7 +251,7 @@ void sourcekitd::initialize() {
   initializeTracing();
 
   assert(!GlobalConn);
-  GlobalConn = xpc_connection_create("com.apple.SourceKitService", NULL);
+  GlobalConn = xpc_connection_create(SOURCEKIT_XPCSERVICE_IDENTIFIER, NULL);
 
   xpc_connection_set_event_handler(GlobalConn, ^(xpc_object_t event) {
     xpc_type_t type = xpc_get_type(event);