Skip to content

build: restructure the installation location #971

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.

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 1 commit into from
Mar 5, 2025

Conversation

compnerd
Copy link
Member

Clean up some of the module property handling to be more declarative. This reduces the operations that are being done on targets in favour of defaults.

Adopt the latest best practices for handling module installation. Introduce the new SwiftTesting_INSTALL_NESTED_SUBDIR option to allow installation into platform/architecture subdirectory allowing multi-architecture installations for platforms like Windows and Android. This is currently opt-in and requires a newer toolchain (something within the last ~2w) to detect the defaults. The values can be overridden by the user if desired.

@compnerd
Copy link
Member Author

CC: @etcwilde

@grynspan grynspan added the build 🧱 Affects the project's build configuration or process label Feb 24, 2025
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd compnerd requested a review from etcwilde February 24, 2025 23:20
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

With local testing:

-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/x86_64/_Testing_Foundation.lib
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/bin64/_Testing_Foundation.dll
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/_Testing_Foundation.swiftmodule/x86_64-unknown-windows-msvc.swiftdoc
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/_Testing_Foundation.swiftmodule/x86_64-unknown-windows-msvc.swiftmodule
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/x86_64/Testing.lib
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/bin64/Testing.dll
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/Testing.swiftmodule/x86_64-unknown-windows-msvc.swiftdoc
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/Testing.swiftmodule/x86_64-unknown-windows-msvc.swiftmodule
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/Testing.swiftcrossimport
-- Installing: S:/Program Files/Swift/Platforms/Windows.platform/Developer/Library/Testing-development/usr/lib/swift/windows/Testing.swiftcrossimport/Foundation.swiftoverlay

Copy link
Contributor

@stmontgomery stmontgomery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had one question about the CMP0157 policy change I just noticed, but otherwise this is looking good to me now

@compnerd
Copy link
Member Author

@swift-ci please test

Copy link
Contributor

@stmontgomery stmontgomery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now, feel free to merge!

Clean up some of the module property handling to be more declarative.
This reduces the operations that are being done on targets in favour
of defaults.

Adopt the latest best practices for handling module installation.
Introduce the new `SwiftTesting_INSTALL_NESTED_SUBDIR` option to allow
installation into platform/architecture subdirectory allowing
multi-architecture installations for platforms like Windows and Android.
This is currently opt-in and requires a newer toolchain (something
within the last ~2w) to detect the defaults. The values can be
overridden by the user if desired.
@compnerd
Copy link
Member Author

compnerd commented Mar 5, 2025

@swift-ci please test

@compnerd compnerd merged commit 8c41943 into swiftlang:main Mar 5, 2025
3 checks passed
@compnerd compnerd deleted the installation branch March 5, 2025 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build 🧱 Affects the project's build configuration or process
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants