Skip to content

Fix embedded plist of back-deployed concurrency library #39934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2021
Merged

Fix embedded plist of back-deployed concurrency library #39934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89ca697
Remove underscores from CFBundleIdentifier of libraries.
DougGregor Oct 27, 2021
b082f29
Propagate Swift version information to the back-deployed binaries
DougGregor Oct 27, 2021
7f0a58f
Fix infernal Python linter warnings
DougGregor Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,9 @@ function(_add_swift_target_library_single target name)
set(PLIST_INFO_PLIST "Info.plist" CACHE STRING "Plist name")
if("${SWIFTLIB_SINGLE_SDK}" IN_LIST SWIFT_APPLE_PLATFORMS AND SWIFTLIB_SINGLE_IS_STDLIB)
set(PLIST_INFO_NAME ${name})
set(PLIST_INFO_UTI "com.apple.dt.runtime.${name}")

# Underscores aren't permitted in the bundle identifier.
string(REPLACE "_" "" PLIST_INFO_UTI "com.apple.dt.runtime.${name}")
set(PLIST_INFO_VERSION "${SWIFT_VERSION}")
if (SWIFT_COMPILER_VERSION)
set(PLIST_INFO_BUILD_VERSION
Expand Down
8 changes: 8 additions & 0 deletions utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@ def build(self, host_target):
self.cmake_options.define('SWIFT_HOST_VARIANT_ARCH:STRING', arch)
self.cmake_options.define('BUILD_STANDALONE:BOOL', True)

# Propagate version information
if self.args.swift_user_visible_version is not None:
self.cmake_options.define('SWIFT_VERSION',
str(self.args.swift_user_visible_version))
if self.args.swift_compiler_version is not None:
self.cmake_options.define('SWIFT_COMPILER_VERSION',
str(self.args.swift_compiler_version))

# Only install the "stdlib" component, which contains the concurrency
# module.
self.cmake_options.define('SWIFT_INSTALL_COMPONENTS:STRING', 'back-deployment')
Expand Down