-
Notifications
You must be signed in to change notification settings - Fork 45
WiX: parametrize authoring for toolchain MSIs #444
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,11 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?> | ||
| <?define VariantName = asserts ?> | ||
| <?define VariantUpgradeCode = $(BldAssertsUpgradeCode)?> | ||
| <?define VariantProductName = !(loc.BldAsserts_ProductName)?> | ||
| <?define VariantCabinetName = bld.asserts.cab?> | ||
| <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?> | ||
| <?define VariantEnvironmentComponentGUID = ab52b870-23ee-42e8-9581-3fcbdfb9228c?> | ||
|
|
||
| <?include ../bld.wxi ?> | ||
| </Wix> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?> | ||
| <?define VariantName = asserts ?> | ||
| <?define VariantUpgradeCode = $(CliAssertsUpgradeCode)?> | ||
| <?define VariantProductName = !(loc.CliAsserts_ProductName)?> | ||
| <?define VariantCabinetName = cli.asserts.cab?> | ||
|
|
||
| <?include ../cli.wxi ?> | ||
| </Wix> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this need to be here or should it go into shared.wxs along with the other GUID constants?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the other ones need to change between major upgrades. this one just needs to have a guid to identify since the Id (
UserPathVariable) is not unique enough. it needs to be different from the other variant. so this is why i put it here.We have 3 of these, in bld (toolchain\usr\bin), rtl (runtimes\usr\bin) and windowssdk(sdks\windows.sdk). we could pull them all out if you want, but not sure if that will add much value
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, okay, we can leave this for now; I am hoping that once we switch to the experimental SDK, the RTL is going to be possible to install into the GAC. We will want to have the RTL that the compiler was built against installed as well as the one that we just built.