Rename toolchain msi and cab files to include name of variant (asserts) #428
Conversation
|
This looks good to me, lets take this over #427 since it already contains that commit as well. I'll trigger a new PR run for this. |
|
https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/5916/ is the run. Seems that the naming of the cabinets and MSIs is not entirely correct yet? @mhegazy mind taking a look at the output? |
There was a problem hiding this comment.
I think this looks fine, though I believe it will require changes on the CI side of things to handle the new filenames. CC @shahmishal
missed, ide.cab rename. apologies. last commit should fix that. |
|
@compnerd mind rerunning the smoke tests |
|
@compnerd gentle ping! |
|
@shahmishal - this changes the cab/msi naming, can we coordinate the change over? |
|
@shahmishal how do you want to coordinate this change? |
This is a follow up change to #428. In this PR we are making directory IDs reflect the variant in the name of the install directory (e.g. `Swift\Toolchains\6.2.0+Asserts\usr`). There is no functional change in this change, it is just directory ids. Directory names and which components are installed to which directories should not be changed. This should make it easier to add new variants by following the same pattern, and will allow us to parametrize authoring that is shared between variants. Naming convention: `ToolchainsVersioned` became `ToolchainsVersionedAsserts` -- this is our top-level toolchain install directory like `Swift\Toolchains\0.0.0+Asserts` Subdirectories like `_usr_share` became `toolchains_asserts_usr_share` to reflect the full path at install time e.g. `Swift\Toolchains\0.0.0+Asserts\usr\share`
This is a follow up change to #428, #433 and #433. And the last change before adding full toolchain variant msi's. In this change we parametrize the authoring in the wxi files for bld, cli, dbg and ide. Similar to previous changes, this should not have any functional changes; it just makes the authoring reusable in the future to add new variants. The changes are mostly mechanical. e.g. a directory id `toolchain_asserts_usr_include` becomes `toolchain_$(VariantName)_usr_include`. This allows the same authoring to be used to create different layouts based on the variant without duplicating, and files added are added in one place. Changes include: - directory Ids that have variant name in them - Component and ComponentGroup Ids that have variant name in them - Upgrade Codes since these are specific to the msi - Cab name, again since these are different passed on msi - Product name, that is the name of the msi
Follow up to #427. This mechanically applies the same changes to the rest of the toolchain msi's to have msi and cab name based on the variant they carry (i.e. asserts)
The
.wixprojmove to to variant specific folder, to make room for adding additional variants in the future. Also renaming the properties holding upgradcode and product name for consistency.This change should not have any functional impact.