Skip to content
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

Jump to bottom

Add merge modules for the runtime. #217

Merged
merged 1 commit into from
Aug 5, 2023
Merged

Add merge modules for the runtime. #217

merged 1 commit into from
Aug 5, 2023

Conversation

barnson
Copy link
Contributor

@barnson barnson commented Jul 31, 2023

  • For sharing, the runtime files are built into a .wixlib, which is then referenced by the merge module project to build a merge module, and then by a package project to build the runtime MSI package.
  • The SDK project has references to the merge module project for each architecture, so it builds the merge modules and consumes them.
  • Sample added showing how to consume the merge module for an app.

Other simplifications:

  • Drop the no-longer-needed var. in $(preprocessor) references.
  • Clean up XML namespaces.
  • Remove no-longer-needed config.wxi.

@barnson
Add merge modules for the runtime.
055495e 
- For sharing, the runtime files are built into a .wixlib, which is then
  referenced by the merge module project to build a merge module, and
  then by a package project to build the runtime MSI package.
- The SDK project has references to the merge module project for each
  architecture, so it builds the merge modules and consumes them.
- Sample added showing how to consume the merge module for an app.

Other simplifications:
- Drop the no-longer-needed `var.` in `$(preprocessor)` references.
- Clean up XML namespaces.
- Remove no-longer-needed config.wxi.
@compnerd compnerd mentioned this pull request Aug 1, 2023
Closed
@compnerd
Copy link
Member

compnerd commented Aug 1, 2023

Testing at: https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/712/

tristanlabelle
tristanlabelle approved these changes Aug 1, 2023
View reviewed changes
Copy link
Contributor

@tristanlabelle tristanlabelle left a comment

Choose a reason for hiding this comment

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

Very exciting!

@compnerd compnerd mentioned this pull request Aug 1, 2023
Open
@compnerd
Copy link
Member

compnerd commented Aug 1, 2023

Re-running at https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/717/

This was referenced Aug 1, 2023
Merged
Merged
@compnerd
Copy link
Member

compnerd commented Aug 2, 2023

The build fails with:

C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\sdk\sdk.wixproj" (default target) (1:7) ->
(CoreCompile target) -> 
  C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\sdk\sdk.wxs(457): error WIX0103: Cannot find the File file '!(bindpath.rtmsm.x86)\runtime.x86.msm'. The following paths were checked: !(bindpath.rtmsm.x86)\runtime.x86.msm, T:\package\sdk\runtime.x86.msm [C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\sdk\sdk.wixproj]
  C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\sdk\sdk.wxs(460): error WIX0103: Cannot find the File file '!(bindpath.rtmsm.amd64)\runtime.amd64.msm'. The following paths were checked: !(bindpath.rtmsm.amd64)\runtime.amd64.msm, T:\package\sdk\runtime.amd64.msm [C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\sdk\sdk.wixproj]

compnerd
compnerd approved these changes Aug 3, 2023
View reviewed changes
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

I do wish that we had split up the changes for the var. prefix removal, that would have been easy to get in early. Just need to wait for CI now on the scripting change, but LGTM.

@barnson
Copy link
Contributor Author

barnson commented Aug 3, 2023

I should at least have made it a separate commit...

@compnerd compnerd merged commit 371b276 into swiftlang:main Aug 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

@tristanlabelle tristanlabelle tristanlabelle approved these changes

@shahmishal shahmishal Awaiting requested review from shahmishal shahmishal is a code owner

@tomerd tomerd Awaiting requested review from tomerd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@barnson @compnerd @tristanlabelle