> On Apr 7, 2016, at 9:34 PM, Argyrios Kyrtzidis via swift-commits
> <swift-comm...@swift.org> wrote:
>
> Repository : github.com/apple/swift
> On branches: master,stable-swift-3.0-merge-branch
Hey, to whomever it may concern: commit notification e-mails started going out
like this this morning, with "stable-swift-3.0-merge-branch" showing up in both
the subject line and the branch list. Seems to be happening across all of the
projects. Can we find a way to not have this happen?
John.
> Link :
> github.com/apple/swift/commit/f242326627f7bc6f991c1db48f7ffaf59ede8c61
>
>> ---------------------------------------------------------------
>
> commit f242326627f7bc6f991c1db48f7ffaf59ede8c61
> Author: Argyrios Kyrtzidis <kyrtzi...@apple.com>
> Date: Thu Apr 7 21:34:26 2016 -0700
>
> [SourceKit] Use DARWIN_TOOLCHAIN_VERSION if provided, as the version to
> use for the XPC service name.
>
> This is to make service name in the external toolchains unique.
> rdar://25612603
>
>
>> ---------------------------------------------------------------
>
> f242326627f7bc6f991c1db48f7ffaf59ede8c61
> tools/SourceKit/CMakeLists.txt | 6 +++++-
> utils/build-script-impl | 6 ++++++
> 2 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/tools/SourceKit/CMakeLists.txt b/tools/SourceKit/CMakeLists.txt
> index 3c3b61e..d2ffbfd 100644
> --- a/tools/SourceKit/CMakeLists.txt
> +++ b/tools/SourceKit/CMakeLists.txt
> @@ -1,6 +1,10 @@
> include(CheckSymbolExists)
>
> -set(SOURCEKIT_VERSION_STRING "${SWIFT_COMPILER_VERSION}")
> +if (DARWIN_TOOLCHAIN_VERSION)
> + set(SOURCEKIT_VERSION_STRING "${DARWIN_TOOLCHAIN_VERSION}")
> +else()
> + set(SOURCEKIT_VERSION_STRING "${SWIFT_COMPILER_VERSION}")
> +endif()
>
> set(SOURCEKIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
> set(SOURCEKIT_BINARY_DIR ${SWIFT_BINARY_DIR})
> diff --git a/utils/build-script-impl b/utils/build-script-impl
> index cf388e9..c71b283 100755
> --- a/utils/build-script-impl
> +++ b/utils/build-script-impl
> @@ -1532,6 +1532,12 @@ for deployment_target in "${HOST_TARGET}"
> "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
> -DSWIFT_COMPILER_VERSION="${SWIFT_COMPILER_VERSION}"
> )
> fi
> + if [[ "${DARWIN_TOOLCHAIN_VERSION}" ]] ; then
> + swift_cmake_options=(
> + "${swift_cmake_options[@]}"
> + -DDARWIN_TOOLCHAIN_VERSION="${DARWIN_TOOLCHAIN_VERSION}"
> + )
> + fi
>
> if [[ "${ENABLE_ASAN}" ]] ; then
> swift_cmake_options=(
>
_______________________________________________
swift-dev mailing list
swift-dev@swift.org
https://lists.swift.org/mailman/listinfo/swift-dev
