WiX: rename version.wxi to config.wxi

compnerd · compnerd · commit 6aa3df698370 · 2023-06-13T15:44:28.000-07:00
The original version information has been removed from the include file
and now only has the configuration for the build.  This allows us to use
a single definition for the various architectures.
diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
@@ -1,5 +1,4 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs
@@ -1,5 +1,4 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/config.wxi b/platforms/Windows/config.wxi
@@ -1,14 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <Include>
-<?if $(var.ProductVersion) = "0.0.0"?>
-<?define RuntimeName = "runtime-development"?>
-<?define ToolchainName = "unknown-Asserts-development.xctoolchain"?>
-<?else?>
-<?define RuntimeName = "runtime-$(var.ProductVersion)"?>
-<?define ToolchainName = "unknown-Asserts-$(var.ProductVersion).xctoolchain"?>
-<?endif?>
-
 <?if $(var.ProductArchitecture) = "amd64"?>
   <?define ProcessorArchitecture = "AMD64"?>
 <?elseif $(var.ProductArchitecture) = "arm64"?>
diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs
@@ -1,5 +1,4 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
@@ -1,5 +1,5 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
+  <?include config.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
@@ -1,5 +1,5 @@
 ﻿<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
+  <?include config.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">`
`2`		`- <?include version.wxi?>`
`3`	`2`	`<Package`
`4`	`3`	`Language="1033"`
`5`	`4`	`Manufacturer="swift.org"`