Skip to content

build: restructure the install location handling #508

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 13, 2025

Conversation

compnerd
Copy link
Member

Adopt the latest best practices for handling module installation. Introduce the new XCTest_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

@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

@@ -0,0 +1,41 @@

set(pti_command "${CMAKE_Swift_COMPILER}" -print-target-info)
Copy link
Member

Choose a reason for hiding this comment

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

... pti? target_info_command is a clearer name.

Adopt the latest best practices for handling module installation.
Introduce the new `XCTest_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 8, 2025

@swift-ci please test

@compnerd
Copy link
Member Author

compnerd commented Mar 9, 2025

/home/build-user/swiftpm/Tests/BasicsTests/SampleTests.swift:1:8: error: no such module 'Testing'
1 | import Testing
  |        `- error: no such module 'Testing'
2 | 
3 | struct Foo {

This seems unrelated to this change?

@compnerd
Copy link
Member Author

compnerd commented Mar 9, 2025

@swift-ci please test Windows platform

3 similar comments
@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

Please test with following PRs:
swiftlang/swift#79935

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

Please test with following PRs:
swiftlang/swift#79977

@swift-ci please test Linux platform

@compnerd compnerd merged commit 7ebe57b into swiftlang:main Mar 13, 2025
2 checks passed
@compnerd compnerd deleted the installation branch March 13, 2025 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants