From d33c01251b60f7765cd7456f1d5271a17f3ca936 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Fri, 21 Jul 2023 16:12:43 -0400 Subject: [PATCH 1/7] Refactoring #1 ## Deduplication - Move common .wixproj content to Directory.Build.props and Directory.Build.targets. - Move common authoring to a shared .wixlib project. - Add localization file for common strings. - Use ComponentGroup/@Directory for default component directories. ## Simplification - Move CompressionLevel into Directory.Build.props. - Have Directory.Build.props import .props (say, to override CompressionLevel for faster local builds). - Remove Id attributes from resources that aren't explicitly referenced. - Remove redundant/irrelevant attributes (e.g., File/@KeyPath). - Use `ProjectReference`s to manage build order and bind paths, including three flavors of SDK. - Remove MSI UI as the bundle UI replaces it. --- platforms/Windows/Directory.Build.props | 51 ++ platforms/Windows/Directory.Build.targets | 4 + platforms/Windows/bld.wixproj | 57 +-- platforms/Windows/bld.wxs | 374 +++++++-------- platforms/Windows/cli.wixproj | 44 +- platforms/Windows/cli.wxs | 288 +++++------ platforms/Windows/dbg.wixproj | 44 +- platforms/Windows/dbg.wxs | 127 ++--- platforms/Windows/ide.wixproj | 44 +- platforms/Windows/ide.wxs | 66 +-- platforms/Windows/installer-amd64.wxs | 21 - platforms/Windows/installer-arm64.wxs | 21 - platforms/Windows/installer.wixproj | 43 +- platforms/Windows/installer.wxs | 35 ++ platforms/Windows/runtime.wixproj | 43 +- platforms/Windows/runtime.wxs | 126 ++--- platforms/Windows/sdk.wixproj | 40 +- platforms/Windows/sdk.wxs | 561 ++++++++++------------ platforms/Windows/shared.wixproj | 10 + platforms/Windows/shared.wxs | 30 ++ platforms/Windows/swift-format.wixproj | 28 +- platforms/Windows/swift-format.wxs | 49 +- platforms/Windows/swift-inspect.wixproj | 28 +- platforms/Windows/swift-inspect.wxs | 38 +- platforms/Windows/swift.en-us.wxl | 16 + 25 files changed, 948 insertions(+), 1240 deletions(-) create mode 100644 platforms/Windows/Directory.Build.props create mode 100644 platforms/Windows/Directory.Build.targets delete mode 100644 platforms/Windows/installer-amd64.wxs delete mode 100644 platforms/Windows/installer-arm64.wxs create mode 100644 platforms/Windows/installer.wxs create mode 100644 platforms/Windows/shared.wixproj create mode 100644 platforms/Windows/shared.wxs create mode 100644 platforms/Windows/swift.en-us.wxl diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props new file mode 100644 index 00000000..6b8d8263 --- /dev/null +++ b/platforms/Windows/Directory.Build.props @@ -0,0 +1,51 @@ + + + + false + true + + + + amd64 + $(ProductArchitecture) + + 0.0.0 + $(ProductVersion) + + + + x64 + + + arm64 + + + arm + + + x86 + + + + + high + + + + + $(DefineConstants); + ProductArchitecture=$(ProductArchitecture); + ProductVersion=$(ProductVersion); + + + + + true + true + + + + diff --git a/platforms/Windows/Directory.Build.targets b/platforms/Windows/Directory.Build.targets new file mode 100644 index 00000000..2fe7db42 --- /dev/null +++ b/platforms/Windows/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/platforms/Windows/bld.wixproj b/platforms/Windows/bld.wixproj index cd362c02..606774c9 100644 --- a/platforms/Windows/bld.wixproj +++ b/platforms/Windows/bld.wixproj @@ -1,50 +1,23 @@ - + - false + + $(DefineConstants); + DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); + TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); + TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT_USR_LIB_CLANG); + - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang - - - - true - true - + + + - - x64 - - - arm64 - 500 - - - arm - 500 - - - x86 - + + + - - + @@ -56,7 +29,5 @@ true true - - diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs index 7163991e..fbe4136d 100644 --- a/platforms/Windows/bld.wxs +++ b/platforms/Windows/bld.wxs @@ -2,65 +2,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + - + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - - + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + @@ -354,7 +331,7 @@ - + @@ -370,16 +347,5 @@ - - - - - - - - - - - diff --git a/platforms/Windows/cli.wixproj b/platforms/Windows/cli.wixproj index 7ff8cf3f..bf7bfa5f 100644 --- a/platforms/Windows/cli.wixproj +++ b/platforms/Windows/cli.wixproj @@ -1,44 +1,14 @@ - + - false - - - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); - - - - x64 - - - arm64 - 500 - - - arm - 500 - - - x86 + + $(DefineConstants); + DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); + TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); + - + diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs index de6e96f6..8f6ceda2 100644 --- a/platforms/Windows/cli.wxs +++ b/platforms/Windows/cli.wxs @@ -1,247 +1,234 @@ - + - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -253,16 +240,5 @@ - - - - - - - - - - - diff --git a/platforms/Windows/dbg.wixproj b/platforms/Windows/dbg.wixproj index a012a5e1..013c9562 100644 --- a/platforms/Windows/dbg.wixproj +++ b/platforms/Windows/dbg.wixproj @@ -1,44 +1,14 @@ - + - false - - - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT) - - - - x64 - - - arm64 - 500 - - - arm - 500 - - - x86 + + $(DefineConstants); + DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); + TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); + - + diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs index 0b39ffd6..ff8dadb0 100644 --- a/platforms/Windows/dbg.wxs +++ b/platforms/Windows/dbg.wxs @@ -2,130 +2,107 @@ - - + - - - - - - - - - - - - - - - - - + + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - diff --git a/platforms/Windows/ide.wixproj b/platforms/Windows/ide.wixproj index f90bbb40..69cd29e8 100644 --- a/platforms/Windows/ide.wixproj +++ b/platforms/Windows/ide.wixproj @@ -1,44 +1,14 @@ - + - false - - - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT) - - - - x64 - - - arm64 - 500 - - - arm - 500 - - - x86 + + $(DefineConstants); + DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); + TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT) + - + diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide.wxs index 69a9d042..21735be6 100644 --- a/platforms/Windows/ide.wxs +++ b/platforms/Windows/ide.wxs @@ -2,78 +2,54 @@ - - + - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - + - - - - - - - - - - - diff --git a/platforms/Windows/installer-amd64.wxs b/platforms/Windows/installer-amd64.wxs deleted file mode 100644 index a8593515..00000000 --- a/platforms/Windows/installer-amd64.wxs +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/installer-arm64.wxs b/platforms/Windows/installer-arm64.wxs deleted file mode 100644 index afd57847..00000000 --- a/platforms/Windows/installer-arm64.wxs +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/installer.wixproj b/platforms/Windows/installer.wixproj index 3681304d..500e9639 100644 --- a/platforms/Windows/installer.wixproj +++ b/platforms/Windows/installer.wixproj @@ -1,39 +1,26 @@ - + - false Bundle - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - runtime.msi%3Bbld.msi%3Bcli.msi%3Bdbg.msi%3Bide.msi%3Bsdk.msi - $(RequiredChain) - - $(OptionalChain) - - - - build\ - build\obj\ - - - - - - ProductVersion=$(ProductVersion);RequiredChain=$(RequiredChain);OptionalChain=$(OptionalChain);MSI_LOCATION=$(MSI_LOCATION); - + + + - + + + + + + + + + + - + diff --git a/platforms/Windows/installer.wxs b/platforms/Windows/installer.wxs new file mode 100644 index 00000000..064dd53d --- /dev/null +++ b/platforms/Windows/installer.wxs @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/runtime.wixproj b/platforms/Windows/runtime.wixproj index 3ce2494e..2f7686ef 100644 --- a/platforms/Windows/runtime.wixproj +++ b/platforms/Windows/runtime.wixproj @@ -1,44 +1,13 @@ - + - false - - - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);SDK_ROOT=$(SDK_ROOT) - - - - x64 - - - arm64 - 500 - - - arm - 500 - - - x86 + + $(DefineConstants); + SDK_ROOT=$(SDK_ROOT) + - + diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs index e0eabaf3..5af1e7ab 100644 --- a/platforms/Windows/runtime.wxs +++ b/platforms/Windows/runtime.wxs @@ -3,112 +3,99 @@ - - + - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - + + - + @@ -117,19 +104,8 @@ - + - - - - - - - - - - - diff --git a/platforms/Windows/sdk.wixproj b/platforms/Windows/sdk.wixproj index 3ff2f0a9..0a50c876 100644 --- a/platforms/Windows/sdk.wixproj +++ b/platforms/Windows/sdk.wixproj @@ -1,35 +1,19 @@ - + - false + + $(DefineConstants); + PLATFORM_ROOT=$(PLATFORM_ROOT); + SDK_ROOT=$(SDK_ROOT); + SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims; + - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims; - - - - true - true - + + + - - + @@ -41,7 +25,9 @@ true true + + diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs index 06de05ca..ff76b091 100644 --- a/platforms/Windows/sdk.wxs +++ b/platforms/Windows/sdk.wxs @@ -1,15 +1,15 @@ - + + - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - - + + - - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + - - - + + - - + + - - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - - + + - - + + - - - + + - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - - + + - - - + + + - - + + - - - + + - - - + + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - + + - - + + - - - + + - - - + + + - - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - - + + @@ -473,7 +445,7 @@ - + @@ -495,21 +467,8 @@ - - - - - - - - - - - - - diff --git a/platforms/Windows/shared.wixproj b/platforms/Windows/shared.wixproj new file mode 100644 index 00000000..de86a62f --- /dev/null +++ b/platforms/Windows/shared.wixproj @@ -0,0 +1,10 @@ + + + false + Library + + + + + + diff --git a/platforms/Windows/shared.wxs b/platforms/Windows/shared.wxs new file mode 100644 index 00000000..cea38393 --- /dev/null +++ b/platforms/Windows/shared.wxs @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/swift-format.wixproj b/platforms/Windows/swift-format.wixproj index 89a4bb58..642ba68a 100644 --- a/platforms/Windows/swift-format.wixproj +++ b/platforms/Windows/swift-format.wixproj @@ -1,29 +1,13 @@ - + - false - - - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductVersion=$(ProductVersion);SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD) + + $(DefineConstants); + SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD); + - + diff --git a/platforms/Windows/swift-format.wxs b/platforms/Windows/swift-format.wxs index cc42a485..99a94460 100644 --- a/platforms/Windows/swift-format.wxs +++ b/platforms/Windows/swift-format.wxs @@ -1,45 +1,38 @@  - - + - - + - - - - - - - - + + + + - - - - - + + + + + + + + + - - - - - - - - - - - diff --git a/platforms/Windows/swift-inspect.wixproj b/platforms/Windows/swift-inspect.wixproj index 79a99f86..ea8efd70 100644 --- a/platforms/Windows/swift-inspect.wixproj +++ b/platforms/Windows/swift-inspect.wixproj @@ -1,29 +1,13 @@ - + - false - - - - amd64 - $(ProductArchitecture) - - 0.0.0 - $(ProductVersion) - - - - build\ - build\obj\ - - - - - - ProductVersion=$(ProductVersion);ProductArchitecture=$(ProductArchitecture);SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD) + + $(DefineConstants); + SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD); + - + diff --git a/platforms/Windows/swift-inspect.wxs b/platforms/Windows/swift-inspect.wxs index 453391d6..9dcca6a7 100644 --- a/platforms/Windows/swift-inspect.wxs +++ b/platforms/Windows/swift-inspect.wxs @@ -6,43 +6,33 @@ UpgradeCode="269fd791-fb3d-4311-96a1-cb98243ee857" Version="$(var.ProductVersion)" Scope="perMachine"> - - - + - - - - - - - - + + + + - - - - - + + + + + + + + + - - - - - - - - diff --git a/platforms/Windows/swift.en-us.wxl b/platforms/Windows/swift.en-us.wxl new file mode 100644 index 00000000..01b202dd --- /dev/null +++ b/platforms/Windows/swift.en-us.wxl @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file From 1ee37540aaa1692e4fef7effe40fb456aea59a34 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 25 Jul 2023 15:51:39 -0400 Subject: [PATCH 2/7] - Moved projects into subdirectories to... better support NuGet package restore. - With projects in subdirectories, enabled automatic project items for compilation and localization. - Added project references to bundle project to get proper build order. - Deduplicate project references to shared.wixproj. - Remove Feature/@ConfigurableDirectory because individual features can't be moved to other directories (just the root). --- platforms/Windows/Directory.Build.props | 32 ++++++++++------ platforms/Windows/Directory.Build.targets | 4 ++ platforms/Windows/Resources/swift_banner.png | Bin 1593 -> 0 bytes platforms/Windows/Resources/swift_dialog.png | Bin 9461 -> 0 bytes platforms/Windows/{ => bld}/bld.wixproj | 8 ---- platforms/Windows/{ => bld}/bld.wxs | 4 +- platforms/Windows/bundle/installer.wixproj | 10 +++++ platforms/Windows/bundle/installer.wxs | 33 ++++++++++++++++ .../Windows/{Resources => bundle}/swift.png | Bin platforms/Windows/{ => cli}/cli.wixproj | 8 ---- platforms/Windows/{ => cli}/cli.wxs | 4 +- platforms/Windows/config.wxi | 31 --------------- platforms/Windows/{ => dbg}/dbg.wixproj | 8 ---- platforms/Windows/{ => dbg}/dbg.wxs | 4 +- platforms/Windows/{ => ide}/ide.wixproj | 8 ---- platforms/Windows/{ => ide}/ide.wxs | 4 +- platforms/Windows/installer.wixproj | 26 ------------- platforms/Windows/installer.wxs | 35 ----------------- .../Windows/{ => runtime}/runtime.wixproj | 8 ---- platforms/Windows/{ => runtime}/runtime.wxs | 36 ++++++++++++------ platforms/Windows/{ => sdk}/sdk.wixproj | 8 ---- platforms/Windows/{ => sdk}/sdk.wxs | 25 ++++++++++-- platforms/Windows/shared.wixproj | 10 ----- platforms/Windows/shared/config.wxi | 13 +++++++ platforms/Windows/shared/shared.wixproj | 5 +++ platforms/Windows/{ => shared}/shared.wxs | 6 +++ .../Windows/{ => shared}/swift.en-us.wxl | 0 .../{ => swift-format}/swift-format.wixproj | 8 ---- .../{ => swift-format}/swift-format.wxs | 17 +-------- .../{ => swift-inspect}/swift-inspect.wixproj | 8 ---- .../{ => swift-inspect}/swift-inspect.wxs | 17 +-------- 31 files changed, 150 insertions(+), 230 deletions(-) delete mode 100644 platforms/Windows/Resources/swift_banner.png delete mode 100644 platforms/Windows/Resources/swift_dialog.png rename platforms/Windows/{ => bld}/bld.wixproj (85%) rename platforms/Windows/{ => bld}/bld.wxs (98%) create mode 100644 platforms/Windows/bundle/installer.wixproj create mode 100644 platforms/Windows/bundle/installer.wxs rename platforms/Windows/{Resources => bundle}/swift.png (100%) rename platforms/Windows/{ => cli}/cli.wixproj (61%) rename platforms/Windows/{ => cli}/cli.wxs (98%) delete mode 100644 platforms/Windows/config.wxi rename platforms/Windows/{ => dbg}/dbg.wixproj (61%) rename platforms/Windows/{ => dbg}/dbg.wxs (97%) rename platforms/Windows/{ => ide}/ide.wixproj (61%) rename platforms/Windows/{ => ide}/ide.wxs (92%) delete mode 100644 platforms/Windows/installer.wixproj delete mode 100644 platforms/Windows/installer.wxs rename platforms/Windows/{ => runtime}/runtime.wixproj (55%) rename platforms/Windows/{ => runtime}/runtime.wxs (75%) rename platforms/Windows/{ => sdk}/sdk.wixproj (85%) rename platforms/Windows/{ => sdk}/sdk.wxs (96%) delete mode 100644 platforms/Windows/shared.wixproj create mode 100644 platforms/Windows/shared/config.wxi create mode 100644 platforms/Windows/shared/shared.wixproj rename platforms/Windows/{ => shared}/shared.wxs (88%) rename platforms/Windows/{ => shared}/swift.en-us.wxl (100%) rename platforms/Windows/{ => swift-format}/swift-format.wixproj (57%) rename platforms/Windows/{ => swift-format}/swift-format.wxs (54%) rename platforms/Windows/{ => swift-inspect}/swift-inspect.wixproj (57%) rename platforms/Windows/{ => swift-inspect}/swift-inspect.wxs (55%) diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props index 6b8d8263..a9a471cf 100644 --- a/platforms/Windows/Directory.Build.props +++ b/platforms/Windows/Directory.Build.props @@ -1,10 +1,5 @@ - - false - true - - amd64 $(ProductArchitecture) @@ -27,25 +22,40 @@ - + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\)) + $(RootBuildFolder) + $(BaseOutputPath)obj\$(MSBuildProjectName)\ + $(BaseOutputPath)$(Configuration)\$(ProductArchitecture)\ + high + + perMachine + true + $(OutputPath) + + + + $(DefineConstants); ProductArchitecture=$(ProductArchitecture); ProductVersion=$(ProductVersion); + PackageScope=$(PackageScope); + IsBundleCompressed=$(IsBundleCompressed); + MSI_LOCATION=$(MSI_LOCATION); + + perMachine + true + + true true - - diff --git a/platforms/Windows/Directory.Build.targets b/platforms/Windows/Directory.Build.targets index 2fe7db42..eb8c333c 100644 --- a/platforms/Windows/Directory.Build.targets +++ b/platforms/Windows/Directory.Build.targets @@ -1,4 +1,8 @@ + + + + diff --git a/platforms/Windows/Resources/swift_banner.png b/platforms/Windows/Resources/swift_banner.png deleted file mode 100644 index cacc0759f2f8ee7688acdb7f2d876f155bc579f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1593 zcmW+%dpy%?7=KlC5tT~XiFMnlMmTawp)hqutq{}Z)+sS-)5RRea!;|)$7OV}u|#FL z#Td(QlvQKLCKMSJh73t=b2-2H=lMME^Sqz;`M%%x`#f*LSH=! z-L^^$@!N<&T=&*U-!@q{+% zO_H6r>T+JBH7Aa0xA%h$Mr3k@iWi)(o9 zP3CS`Ggam}&>-X&_gbxmt{#tI%zAZp9@cKbr&-7q#a-m3kpscM?$(K8uQp%Y%o+`X zNR0X@d5@beGs|Jb2Fyk7}?q;kZ$a zx>&-m)g255!=`-1i&W(~U7|0Rr7?n>&O-bHMX(W7!Nad!`n!M_&bQ(+`X?HrH)t~1 zTbtgEdatEH<#J9*I|U-qDR`LSg0#2vJ#MMTWU9aZ3kQ|tcqCEZ%5?<*nqoaN&rA4b zkzodfPKc)P7#hPvko5hUW9QP z76MZjiq5uo-T@`yl|DQoTWgC_fZl{ie&|1UGq7P4S)&ZDD7a4<#?7`dA~r!1{zhoI z?EiE``yeAE|BGDKd!K*r(8LFIYfHU8^@e&yy1@z%rLxGIB)4S~YdKPuyoGfD>YPI4 zj1h5mt}mldO~2Q*TZSO11|jQQc<#e(xCZH~X)4EOU%3hxc(%3EQ5I#9l#HE!kZf|W zr?TQsesI=Wd4}OaY7Tu49T;aG4r#zcTz`OPw8+sP&ApH{GLni#vxCC}LKXE)NZ}zd zJCN!~%9qD84odBzS5g;RohWdoL}zFDdA-%(^}{J&8Qh@rn`7(BSgrKY1lhI$`Sb@P zwS)!xD|3ss0><@?8o)O(6J7%k05shacSP29*pD4W7!R5D05U?2qzKe|RDzT*(pC>l z%7W%6@NKn9;uC*JaHEEC`Jm@dn%5Rrxo<3k;RAuAYZWZQL;h&FO zw3hEGzTJNfME#*vD0fM}YKOPCT)OG}8aJTnnpfwpVThz^K2`yVDI=rwXO2vEH(A+7 zi7eqK=l+2*TfaCMpoSe(brgVCLps}`yQ=nd@HtC895=QnL*>g zIc0lQpwFeR%L6C5!fnVntrb)2Y5LDh)+7NsmtI@DziO6O?AI7-Ry`)YDOV@D<@9uo zDPO#GNOe~n{aD`2WOfbc`Mk!|vRPf>o5krUTFS5P`NSJyclAVDLfsSncD^zH0~81ZasU7T diff --git a/platforms/Windows/Resources/swift_dialog.png b/platforms/Windows/Resources/swift_dialog.png deleted file mode 100644 index 0c206cacca5a0cf66ba4aa33a1822eb5dd081b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9461 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 YcEiQ$EUlI>L}$QI&+K-s&i$zW1@7sSCIA2c diff --git a/platforms/Windows/bld.wixproj b/platforms/Windows/bld/bld.wixproj similarity index 85% rename from platforms/Windows/bld.wixproj rename to platforms/Windows/bld/bld.wixproj index 606774c9..b8b66b3a 100644 --- a/platforms/Windows/bld.wixproj +++ b/platforms/Windows/bld/bld.wixproj @@ -12,14 +12,6 @@ - - - - - - - - ClangResources diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld/bld.wxs similarity index 98% rename from platforms/Windows/bld.wxs rename to platforms/Windows/bld/bld.wxs index fbe4136d..4bb09959 100644 --- a/platforms/Windows/bld.wxs +++ b/platforms/Windows/bld/bld.wxs @@ -5,7 +5,7 @@ Name="!(loc.Bld_ProductName)" UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb" Version="$(var.ProductVersion)" - Scope="perMachine"> + Scope="$(PackageScope)"> @@ -331,7 +331,7 @@ - + diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj new file mode 100644 index 00000000..e4ae499e --- /dev/null +++ b/platforms/Windows/bundle/installer.wixproj @@ -0,0 +1,10 @@ + + + Bundle + swift-$(ProductVersion)-X-windows10 + + + + + + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs new file mode 100644 index 00000000..206f89f7 --- /dev/null +++ b/platforms/Windows/bundle/installer.wxs @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/Resources/swift.png b/platforms/Windows/bundle/swift.png similarity index 100% rename from platforms/Windows/Resources/swift.png rename to platforms/Windows/bundle/swift.png diff --git a/platforms/Windows/cli.wixproj b/platforms/Windows/cli/cli.wixproj similarity index 61% rename from platforms/Windows/cli.wixproj rename to platforms/Windows/cli/cli.wixproj index bf7bfa5f..e5a7992d 100644 --- a/platforms/Windows/cli.wixproj +++ b/platforms/Windows/cli/cli.wixproj @@ -6,12 +6,4 @@ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); - - - - - - - - diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli/cli.wxs similarity index 98% rename from platforms/Windows/cli.wxs rename to platforms/Windows/cli/cli.wxs index 8f6ceda2..6193dec1 100644 --- a/platforms/Windows/cli.wxs +++ b/platforms/Windows/cli/cli.wxs @@ -5,7 +5,7 @@ Name="!(loc.Cli_ProductName)" UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89" Version="$(var.ProductVersion)" - Scope="perMachine"> + Scope="$(PackageScope)"> @@ -228,7 +228,7 @@ - + diff --git a/platforms/Windows/config.wxi b/platforms/Windows/config.wxi deleted file mode 100644 index cda1f856..00000000 --- a/platforms/Windows/config.wxi +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj similarity index 61% rename from platforms/Windows/dbg.wixproj rename to platforms/Windows/dbg/dbg.wixproj index 013c9562..e5a7992d 100644 --- a/platforms/Windows/dbg.wixproj +++ b/platforms/Windows/dbg/dbg.wixproj @@ -6,12 +6,4 @@ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); - - - - - - - - diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg/dbg.wxs similarity index 97% rename from platforms/Windows/dbg.wxs rename to platforms/Windows/dbg/dbg.wxs index ff8dadb0..5998e6f7 100644 --- a/platforms/Windows/dbg.wxs +++ b/platforms/Windows/dbg/dbg.wxs @@ -5,7 +5,7 @@ Name="!(loc.Dbg_ProductName)" UpgradeCode="91d382af-1e92-44dc-a4ad-aee91c1b5160" Version="$(var.ProductVersion)" - Scope="perMachine"> + Scope="$(PackageScope)"> @@ -98,7 +98,7 @@ - + diff --git a/platforms/Windows/ide.wixproj b/platforms/Windows/ide/ide.wixproj similarity index 61% rename from platforms/Windows/ide.wixproj rename to platforms/Windows/ide/ide.wixproj index 69cd29e8..31cb55df 100644 --- a/platforms/Windows/ide.wixproj +++ b/platforms/Windows/ide/ide.wixproj @@ -6,12 +6,4 @@ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT) - - - - - - - - diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide/ide.wxs similarity index 92% rename from platforms/Windows/ide.wxs rename to platforms/Windows/ide/ide.wxs index 21735be6..c29a7ffc 100644 --- a/platforms/Windows/ide.wxs +++ b/platforms/Windows/ide/ide.wxs @@ -5,7 +5,7 @@ Name="!(loc.Ide_ProductName)" UpgradeCode="8dd91c86-d13d-490b-b06b-9522a9cf504c" Version="$(var.ProductVersion)" - Scope="perMachine"> + Scope="$(PackageScope)"> @@ -45,7 +45,7 @@ - + diff --git a/platforms/Windows/installer.wixproj b/platforms/Windows/installer.wixproj deleted file mode 100644 index 500e9639..00000000 --- a/platforms/Windows/installer.wixproj +++ /dev/null @@ -1,26 +0,0 @@ - - - Bundle - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/installer.wxs b/platforms/Windows/installer.wxs deleted file mode 100644 index 064dd53d..00000000 --- a/platforms/Windows/installer.wxs +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/runtime.wixproj b/platforms/Windows/runtime/runtime.wixproj similarity index 55% rename from platforms/Windows/runtime.wixproj rename to platforms/Windows/runtime/runtime.wixproj index 2f7686ef..89b2c05d 100644 --- a/platforms/Windows/runtime.wixproj +++ b/platforms/Windows/runtime/runtime.wixproj @@ -5,12 +5,4 @@ SDK_ROOT=$(SDK_ROOT) - - - - - - - - diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime/runtime.wxs similarity index 75% rename from platforms/Windows/runtime.wxs rename to platforms/Windows/runtime/runtime.wxs index 5af1e7ab..736c52af 100644 --- a/platforms/Windows/runtime.wxs +++ b/platforms/Windows/runtime/runtime.wxs @@ -1,16 +1,28 @@  - + + + Scope="$(PackageScope)"> + + + + + + + + + + + + - - + @@ -52,13 +64,13 @@ - + - + @@ -67,7 +79,7 @@ - + @@ -79,7 +91,7 @@ - + @@ -87,15 +99,15 @@ - + - + - + @@ -104,7 +116,7 @@ - + diff --git a/platforms/Windows/sdk.wixproj b/platforms/Windows/sdk/sdk.wixproj similarity index 85% rename from platforms/Windows/sdk.wixproj rename to platforms/Windows/sdk/sdk.wixproj index 0a50c876..3b664580 100644 --- a/platforms/Windows/sdk.wixproj +++ b/platforms/Windows/sdk/sdk.wixproj @@ -12,10 +12,6 @@ - - - - SwiftShims @@ -26,8 +22,4 @@ true - - - - diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk/sdk.wxs similarity index 96% rename from platforms/Windows/sdk.wxs rename to platforms/Windows/sdk/sdk.wxs index ff76b091..e8b2f564 100644 --- a/platforms/Windows/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -1,13 +1,32 @@  - + + + + + + + + + + + + + + + + + + + + + Scope="$(PackageScope)"> @@ -445,7 +464,7 @@ - + diff --git a/platforms/Windows/shared.wixproj b/platforms/Windows/shared.wixproj deleted file mode 100644 index de86a62f..00000000 --- a/platforms/Windows/shared.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - false - Library - - - - - - diff --git a/platforms/Windows/shared/config.wxi b/platforms/Windows/shared/config.wxi new file mode 100644 index 00000000..edfea53a --- /dev/null +++ b/platforms/Windows/shared/config.wxi @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/platforms/Windows/shared/shared.wixproj b/platforms/Windows/shared/shared.wixproj new file mode 100644 index 00000000..729adf59 --- /dev/null +++ b/platforms/Windows/shared/shared.wixproj @@ -0,0 +1,5 @@ + + + Library + + diff --git a/platforms/Windows/shared.wxs b/platforms/Windows/shared/shared.wxs similarity index 88% rename from platforms/Windows/shared.wxs rename to platforms/Windows/shared/shared.wxs index cea38393..a83b2dd9 100644 --- a/platforms/Windows/shared.wxs +++ b/platforms/Windows/shared/shared.wxs @@ -27,4 +27,10 @@ + + + + + + diff --git a/platforms/Windows/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl similarity index 100% rename from platforms/Windows/swift.en-us.wxl rename to platforms/Windows/shared/swift.en-us.wxl diff --git a/platforms/Windows/swift-format.wixproj b/platforms/Windows/swift-format/swift-format.wixproj similarity index 57% rename from platforms/Windows/swift-format.wixproj rename to platforms/Windows/swift-format/swift-format.wixproj index 642ba68a..5e30fe01 100644 --- a/platforms/Windows/swift-format.wixproj +++ b/platforms/Windows/swift-format/swift-format.wixproj @@ -5,12 +5,4 @@ SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD); - - - - - - - - diff --git a/platforms/Windows/swift-format.wxs b/platforms/Windows/swift-format/swift-format.wxs similarity index 54% rename from platforms/Windows/swift-format.wxs rename to platforms/Windows/swift-format/swift-format.wxs index 99a94460..acb4c270 100644 --- a/platforms/Windows/swift-format.wxs +++ b/platforms/Windows/swift-format/swift-format.wxs @@ -5,23 +5,10 @@ Name="!(loc.Fmt_ProductName)" UpgradeCode="45f1ae7a-4d90-414d-80b3-a5a45898b212" Version="$(var.ProductVersion)" - Scope="perMachine"> + Scope="$(PackageScope)"> - - - - - - - - - - - - - @@ -30,7 +17,7 @@ - + diff --git a/platforms/Windows/swift-inspect.wixproj b/platforms/Windows/swift-inspect/swift-inspect.wixproj similarity index 57% rename from platforms/Windows/swift-inspect.wixproj rename to platforms/Windows/swift-inspect/swift-inspect.wixproj index ea8efd70..066751e2 100644 --- a/platforms/Windows/swift-inspect.wixproj +++ b/platforms/Windows/swift-inspect/swift-inspect.wixproj @@ -5,12 +5,4 @@ SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD); - - - - - - - - diff --git a/platforms/Windows/swift-inspect.wxs b/platforms/Windows/swift-inspect/swift-inspect.wxs similarity index 55% rename from platforms/Windows/swift-inspect.wxs rename to platforms/Windows/swift-inspect/swift-inspect.wxs index 9dcca6a7..cfd599b5 100644 --- a/platforms/Windows/swift-inspect.wxs +++ b/platforms/Windows/swift-inspect/swift-inspect.wxs @@ -5,23 +5,10 @@ Name="swift-inspect" UpgradeCode="269fd791-fb3d-4311-96a1-cb98243ee857" Version="$(var.ProductVersion)" - Scope="perMachine"> + Scope="$(PackageScope)"> - - - - - - - - - - - - - @@ -30,7 +17,7 @@ - + From ab20ff984ce8d65eb04afc23c94ad3cd872bbd46 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 25 Jul 2023 21:51:21 -0400 Subject: [PATCH 3/7] Address review feedback: - Localize MSI_LOCATION to bundle. - Undo custom bundle output name for compatibility. - Fix whitespace and EOF. - Conditionalize stuff not yet available on Arm64. - Harvest with stable GUIDs instead of generated GUIDs. --- platforms/Windows/Directory.Build.props | 4 +--- platforms/Windows/bundle/installer.wixproj | 2 +- platforms/Windows/bundle/installer.wxs | 12 +++++++----- platforms/Windows/shared/swift.en-us.wxl | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props index a9a471cf..d2d21b39 100644 --- a/platforms/Windows/Directory.Build.props +++ b/platforms/Windows/Directory.Build.props @@ -33,7 +33,6 @@ perMachine true - $(OutputPath) @@ -45,7 +44,6 @@ ProductVersion=$(ProductVersion); PackageScope=$(PackageScope); IsBundleCompressed=$(IsBundleCompressed); - MSI_LOCATION=$(MSI_LOCATION); @@ -56,6 +54,6 @@ true - true + true diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index e4ae499e..59a909bf 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -1,7 +1,7 @@  Bundle - swift-$(ProductVersion)-X-windows10 + $(DefineConstants);MSI_LOCATION=$(MSI_LOCATION); diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 206f89f7..5913c586 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -12,11 +12,11 @@ + LicenseUrl="https://www.swift.org/LICENSE.txt" + LogoFile="swift.png" + SuppressOptionsUI="yes" + SuppressRepair="no" + Theme="hyperlinkLicense" /> @@ -25,8 +25,10 @@ + + diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 01b202dd..5fc0a450 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -13,4 +13,4 @@ - \ No newline at end of file + From 325562aff28b4a9e2a5c4e5b80b7f9097d201957 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 26 Jul 2023 14:15:10 -0400 Subject: [PATCH 4/7] Absorb swift-format and swift-inspect.dbg... ...into cli and dbg, respectively, and: - Add placeholder MajorUpgrades (pending new upgrade strategy). - Add shared SystemToolsEnvironmentVariables component. --- platforms/Windows/bld/bld.wxs | 5 ++-- platforms/Windows/bundle/installer.wxs | 4 --- platforms/Windows/cli/cli.wixproj | 2 ++ platforms/Windows/cli/cli.wxs | 12 +++++++++ platforms/Windows/dbg/dbg.wixproj | 2 ++ platforms/Windows/dbg/dbg.wxs | 12 +++++++++ platforms/Windows/ide/ide.wxs | 1 + platforms/Windows/runtime/runtime.wxs | 1 + platforms/Windows/sdk/sdk.wxs | 1 + platforms/Windows/shared/shared.wxs | 6 +++++ platforms/Windows/shared/swift.en-us.wxl | 5 +--- .../Windows/swift-format/swift-format.wixproj | 8 ------ .../Windows/swift-format/swift-format.wxs | 25 ------------------- .../swift-inspect/swift-inspect.wixproj | 8 ------ .../Windows/swift-inspect/swift-inspect.wxs | 25 ------------------- 15 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 platforms/Windows/swift-format/swift-format.wixproj delete mode 100644 platforms/Windows/swift-format/swift-format.wxs delete mode 100644 platforms/Windows/swift-inspect/swift-inspect.wixproj delete mode 100644 platforms/Windows/swift-inspect/swift-inspect.wxs diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs index 4bb09959..d6d3e4dd 100644 --- a/platforms/Windows/bld/bld.wxs +++ b/platforms/Windows/bld/bld.wxs @@ -8,6 +8,7 @@ Scope="$(PackageScope)"> + @@ -324,10 +325,10 @@ - + - + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 5913c586..11348d3b 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -25,10 +25,6 @@ - - - - diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj index e5a7992d..80f91146 100644 --- a/platforms/Windows/cli/cli.wixproj +++ b/platforms/Windows/cli/cli.wixproj @@ -4,6 +4,8 @@ $(DefineConstants); DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); + SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD); + INCLUDE_SWIFT_FORMAT=$(INCLUDE_SWIFT_FORMAT); diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs index 6193dec1..cd6642c1 100644 --- a/platforms/Windows/cli/cli.wxs +++ b/platforms/Windows/cli/cli.wxs @@ -8,6 +8,7 @@ Scope="$(PackageScope)"> + @@ -228,6 +229,16 @@ + + + + + + + + + + @@ -239,6 +250,7 @@ + diff --git a/platforms/Windows/dbg/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj index e5a7992d..67470896 100644 --- a/platforms/Windows/dbg/dbg.wixproj +++ b/platforms/Windows/dbg/dbg.wixproj @@ -4,6 +4,8 @@ $(DefineConstants); DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); + SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD); + INCLUDE_SWIFT_INSPECT=$(INCLUDE_SWIFT_INSPECT); diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxs index 5998e6f7..f81c4315 100644 --- a/platforms/Windows/dbg/dbg.wxs +++ b/platforms/Windows/dbg/dbg.wxs @@ -8,6 +8,7 @@ Scope="$(PackageScope)"> + @@ -98,11 +99,22 @@ + + + + + + + + + + + diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxs index c29a7ffc..7946bb54 100644 --- a/platforms/Windows/ide/ide.wxs +++ b/platforms/Windows/ide/ide.wxs @@ -8,6 +8,7 @@ Scope="$(PackageScope)"> + diff --git a/platforms/Windows/runtime/runtime.wxs b/platforms/Windows/runtime/runtime.wxs index 736c52af..ddf5679d 100644 --- a/platforms/Windows/runtime/runtime.wxs +++ b/platforms/Windows/runtime/runtime.wxs @@ -10,6 +10,7 @@ Scope="$(PackageScope)"> + diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index e8b2f564..af2968ea 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -29,6 +29,7 @@ Scope="$(PackageScope)"> + - + @@ -10,7 +9,5 @@ - - diff --git a/platforms/Windows/swift-format/swift-format.wixproj b/platforms/Windows/swift-format/swift-format.wixproj deleted file mode 100644 index 5e30fe01..00000000 --- a/platforms/Windows/swift-format/swift-format.wixproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - $(DefineConstants); - SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD); - - - diff --git a/platforms/Windows/swift-format/swift-format.wxs b/platforms/Windows/swift-format/swift-format.wxs deleted file mode 100644 index acb4c270..00000000 --- a/platforms/Windows/swift-format/swift-format.wxs +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/swift-inspect/swift-inspect.wixproj b/platforms/Windows/swift-inspect/swift-inspect.wixproj deleted file mode 100644 index 066751e2..00000000 --- a/platforms/Windows/swift-inspect/swift-inspect.wixproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - $(DefineConstants); - SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD); - - - diff --git a/platforms/Windows/swift-inspect/swift-inspect.wxs b/platforms/Windows/swift-inspect/swift-inspect.wxs deleted file mode 100644 index cfd599b5..00000000 --- a/platforms/Windows/swift-inspect/swift-inspect.wxs +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - From ab254010444746b5f4a7e6fe393e501541544c39 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 26 Jul 2023 18:20:02 -0400 Subject: [PATCH 5/7] Fix TOOLCHAIN_ROOT_USR_LIB_CLANG path build break. --- platforms/Windows/bld/bld.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/bld.wixproj index b8b66b3a..7847d2e5 100644 --- a/platforms/Windows/bld/bld.wixproj +++ b/platforms/Windows/bld/bld.wixproj @@ -4,7 +4,7 @@ $(DefineConstants); DEVTOOLS_ROOT=$(DEVTOOLS_ROOT); TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT); - TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT_USR_LIB_CLANG); + TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang; From 60f1416cf912232e85fc9dd141f878abd31a78f0 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 26 Jul 2023 21:21:20 -0400 Subject: [PATCH 6/7] Embed cabinets (revisit on bundle redesign). --- platforms/Windows/bld/bld.wxs | 2 +- platforms/Windows/cli/cli.wxs | 2 +- platforms/Windows/dbg/dbg.wxs | 2 +- platforms/Windows/ide/ide.wxs | 2 +- platforms/Windows/runtime/runtime.wxs | 2 +- platforms/Windows/sdk/sdk.wxs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs index d6d3e4dd..3997c763 100644 --- a/platforms/Windows/bld/bld.wxs +++ b/platforms/Windows/bld/bld.wxs @@ -7,7 +7,7 @@ Version="$(var.ProductVersion)" Scope="$(PackageScope)"> - + diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs index cd6642c1..78a99bfc 100644 --- a/platforms/Windows/cli/cli.wxs +++ b/platforms/Windows/cli/cli.wxs @@ -7,7 +7,7 @@ Version="$(var.ProductVersion)" Scope="$(PackageScope)"> - + diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxs index f81c4315..7e539146 100644 --- a/platforms/Windows/dbg/dbg.wxs +++ b/platforms/Windows/dbg/dbg.wxs @@ -7,7 +7,7 @@ Version="$(var.ProductVersion)" Scope="$(PackageScope)"> - + diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxs index 7946bb54..f564e7a7 100644 --- a/platforms/Windows/ide/ide.wxs +++ b/platforms/Windows/ide/ide.wxs @@ -7,7 +7,7 @@ Version="$(var.ProductVersion)" Scope="$(PackageScope)"> - + diff --git a/platforms/Windows/runtime/runtime.wxs b/platforms/Windows/runtime/runtime.wxs index ddf5679d..2ba87905 100644 --- a/platforms/Windows/runtime/runtime.wxs +++ b/platforms/Windows/runtime/runtime.wxs @@ -9,7 +9,7 @@ Version="$(var.ProductVersion)" Scope="$(PackageScope)"> - + diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index af2968ea..f34063e8 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -28,7 +28,7 @@ Version="$(var.ProductVersion)" Scope="$(PackageScope)"> - +