WiX: package up the experimental dynamic SDK and the runtime redistributables #456
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <Project Sdk="WixToolset.Sdk/4.0.5"> | ||
| <PropertyGroup> | ||
| <OutputName>rtl.shared.$(ProductArchitecture)</OutputName> | ||
| <OutputType>Library</OutputType> | ||
| <BindFiles>true</BindFiles> | ||
| </PropertyGroup> | ||
| </Project> |
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 |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <Fragment> | ||
| <?if $(sys.BUILDARCH) == x64 ?> | ||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "E33B165B-8460-467D-ABCD-27EA8197A3CF" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?> | ||
| <?elseif $(sys.BUILDARCH) == arm64 ?> | ||
|
There was a problem hiding this comment. nit. in most other places, order is arm64, x64, x86 |
||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "BFFDD8F7-CC47-40CB-AF0E-095273FF10FC" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?> | ||
| <?elseif $(sys.BUILDARCH) == x86 ?> | ||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "72064820-3795-4331-8CBD-FF1ABA7DAE7B" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?> | ||
| <?endif?> | ||
|
|
||
| <Directory Id="RUNTIMEDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(RuntimeDirectoryComponentGuidGenerationSeed)" /> | ||
|
|
||
| <ComponentGroup Id="stdlib_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)"> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftCore.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftCRT.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftDistributed.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftObservation.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftRegexBuilder.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftRemoteMirror.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftSwiftOnoneSupport.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftSynchronization.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftWinSDK.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swift_Builtin_float.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swift_Concurrency.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swift_Differentiation.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swift_RegexParser.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swift_StringProcessing.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swift_Volatile.dll" /> | ||
| </Component> | ||
|
|
||
| <!-- TODO(compnerd) should we distribute the undecoration library in the runtime? | ||
| <Component Directory="_usr_bin" Id="swiftDemangle.dll"> | ||
| <File Id="swiftDemangle.dll" Source="$(RuntimeRoot)\bin\swiftDemangle.dll" /> | ||
| </Component> | ||
| --> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="BlocksRuntime_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)"> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\BlocksRuntime.dll" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="libdispatch_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)"> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\dispatch.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\swiftDispatch.dll" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="Foundation_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)"> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\Foundation.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\FoundationEssentials.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\FoundationInternationalization.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\FoundationNetworking.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\FoundationXML.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\_FoundationICU.dll" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="plutil_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)"> | ||
| <Component> | ||
| <File Source="$(RuntimeRoot)\usr\bin\plutil.exe" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="swift_runtime_$(ProductArchitecture)"> | ||
| <ComponentGroupRef Id="stdlib_$(ProductArchitecture)" /> | ||
| <ComponentGroupRef Id="BlocksRuntime_$(ProductArchitecture)" /> | ||
| <ComponentGroupRef Id="libdispatch_$(ProductArchitecture)" /> | ||
| <ComponentGroupRef Id="Foundation_$(ProductArchitecture)" /> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="swift_runtime_utilities_$(ProductArchitecture)"> | ||
| <ComponentGroupRef Id="plutil_$(ProductArchitecture)" /> | ||
| </ComponentGroup> | ||
| </Fragment> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <Project Sdk="WixToolset.Sdk/4.0.5"> | ||
| <PropertyGroup> | ||
| <OutputName>rtl.$(ProductArchitecture)</OutputName> | ||
| <DefineConstants> | ||
| $(DefineConstants); | ||
| VCRedistDir=$(VCRedistDir); | ||
| </DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' "> | ||
| <ProjectReference Include="..\lib\rtl.shared.lib.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' "> | ||
| <ProjectReference Include="..\lib\rtl.shared.lib.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' "> | ||
| <ProjectReference Include="..\lib\rtl.shared.lib.wixproj" Properties="ProductArchitecture=x86;Platform=x86" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="WixToolset.Heat" Version="4.0.5" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <HarvestDirectory Include="$(VCRedistDir)"> | ||
| <ComponentGroupName>VCRuntime_$(ProductArchitecture)</ComponentGroupName> | ||
| <DirectoryRefId>RUNTIMEDIR_$(ProductArchitecture)</DirectoryRefId> | ||
| <PreprocessorVariable>var.VCRedistDir</PreprocessorVariable> | ||
| <SuppressCom>true</SuppressCom> | ||
| <SuppressRegistry>true</SuppressRegistry> | ||
| <SuppressRootDirectory>true</SuppressRootDirectory> | ||
| </HarvestDirectory> | ||
| </ItemGroup> | ||
| </Project> |
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 |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <Package | ||
| Language="1033" | ||
| Manufacturer="!(loc.ManufacturerName)" | ||
| Name="!(loc.Rtl_ProductName_$(ProductArchitecture))" | ||
| UpgradeCode="$(ExperimentalRTLUpgradeCode)" | ||
| Version="$(NonSemVerProductVersion)" | ||
| Scope="$(PackageScope)"> | ||
|
|
||
| <Media Id="1" Cabinet="rtl.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" /> | ||
|
|
||
| <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(ExperimentalRTLUpgradeCode)" /> | ||
| <FeatureGroupRef Id="SideBySideUpgradeStrategy" /> | ||
|
|
||
| <!-- Point the RTL component group to the right directory. --> | ||
| <DirectoryRef Id="runtimes_usr_bin" /> | ||
| <SetDirectory Id="RUNTIMEDIR_$(ProductArchitecture)" Value="[runtimes_usr_bin]" Sequence="first" /> | ||
|
|
||
| <ComponentGroup Id="EnvironmentVariables" Directory="RUNTIMEDIR_$(ProductArchitecture)"> | ||
| <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Guid="bc309c80-221e-48db-b989-07157ac8f286"> | ||
| <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[runtimes_usr_bin]" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <Feature Id="VCRuntime" AllowAbsent="no" Title="!(loc.VCRuntime_ProductName_$(ProductArchitecture))"> | ||
| <ComponentGroupRef Id="VCRuntime_$(ProductArchitecture)" /> | ||
| </Feature> | ||
|
|
||
| <Feature Id="SwiftRuntime" AllowAbsent="no" Title="!(loc.Rtl_ProductName_$(ProductArchitecture))"> | ||
| <ComponentGroupRef Id="swift_runtime_$(ProductArchitecture)" /> | ||
| <ComponentGroupRef Id="EnvironmentVariables" /> | ||
| <ComponentGroupRef Id="VersionedDirectoryCleanup" /> | ||
| </Feature> | ||
|
|
||
| <Feature Id="SwiftRuntimeUtilities" AllowAbsent="yes" Title="!(loc.Utl_ProductName_$(ProductArchitecture))"> | ||
| <Level Condition="INSTALLUTILITIES = 0" Value="0" /> | ||
| <ComponentGroupRef Id="swift_runtime_utilities_$(ProductArchitecture)" /> | ||
| </Feature> | ||
| </Package> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project Sdk="WixToolset.Sdk/4.0.5"> | ||
| <PropertyGroup> | ||
| <OutputType>Module</OutputType> | ||
| <OutputName>rtl.shared.$(ProductArchitecture)</OutputName> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' "> | ||
| <ProjectReference Include="..\lib\rtl.shared.lib.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' "> | ||
| <ProjectReference Include="..\lib\rtl.shared.lib.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' "> | ||
| <ProjectReference Include="..\lib\rtl.shared.lib.wixproj" Properties="ProductArchitecture=x86;Platform=x86" /> | ||
| </ItemGroup> | ||
| </Project> |
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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
|
|
||
| <?if $(sys.BUILDARCH) == x64 ?> | ||
| <?define ModuleId = "18546442-4BD6-4B39-B030-7B4F46CF07F8" ?> | ||
| <?elseif $(sys.BUILDARCH) == arm64 ?> | ||
| <?define ModuleId = "41013040-0B93-4BA0-8544-9437366AD3CF" ?> | ||
| <?elseif $(sys.BUILDARCH) == x86 ?> | ||
| <?define ModuleId = "B4250F08-F3A0-4A7A-A27D-24CC473D5F16" ?> | ||
| <?endif?> | ||
|
|
||
| <Module Guid="$(ModuleId)" Id="swift_runtime" Language="0" Version="$(NonSemVerProductVersion)"> | ||
| <ComponentGroupRef Id="swift_runtime_$(ProductArchitecture)" /> | ||
| <ComponentGroupRef Id="swift_runtime_utilities_$(ProductArchitecture)" /> | ||
| </Module> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <Project Sdk="WixToolset.Sdk/4.0.5"> | ||
| <PropertyGroup> | ||
| <OutputType>Module</OutputType> | ||
| <OutputName>rtl.static.$(ProductArchitecture)</OutputName> | ||
| </PropertyGroup> | ||
| </Project> |
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 |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
|
|
||
| <?if $(sys.BUILDARCH) == x86 ?> | ||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "D3021274-DCA3-4369-82D3-B6CEE436A3FC" ?> | ||
| <?define ModuleID = "53C54287-A59A-4828-A526-4F64E00B340E" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?> | ||
| <?elseif $(sys.BUILDARCH) == x64 ?> | ||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "639A8564-3505-4424-BA2F-449AAF743A90" ?> | ||
| <?define ModuleID = "F84DDCA4-72B0-42AB-9316-21DBAB241540" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?> | ||
| <?elseif $(sys.BUILDARCH) == arm64 ?> | ||
| <?define RuntimeDirectoryComponentGuidGenerationSeed = "F8BF026F-8E3F-42B5-A5E7-E0A4D186EDF3" ?> | ||
| <?define ModuleID = "0439EF46-C6C2-43DF-A5A7-8F4C3F5C64A7" ?> | ||
| <?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?> | ||
| <?endif?> | ||
|
|
||
| <Module Guid="$(ModuleID)" Id="swift_runtime" Language="0" Version="$(NonSemVerProductVersion)"> | ||
| <Directory Id="RUNTIMEDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(RuntimeDirectoryComponentGuidGenerationSeed)"> | ||
| <Component Id="BlocksRuntime_$(ProductArchitecture)"> | ||
| <File Source="$(RuntimeRoot)\usr\bin\BlocksRuntime.dll" /> | ||
| </Component> | ||
|
|
||
| <Component Id="libdispatch_$(ProductArchitecture)"> | ||
| <File Source="$(RuntimeRoot)\usr\bin\dispatch.dll" /> | ||
| </Component> | ||
| </Directory> | ||
| </Module> | ||
| </Wix> |
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.
nit. would be nice to change the existing one to have similar name and folder structure e.g.
rtl\legacy\msm\rtl.legacy.msm.wixprojThere 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.
Yeah, I would absolutely be in favour of this change. My reasoning for not doing this is to have it stick out like a sore thumb. This is meant to be removed rapidly - we do not want to continue building the legacy bits because it costs time/money and also taxes developer resources.