5.2: repair the installer generation

Author: compnerd

.ci/templates/toolchain-msi.yml

@@ -71,11 +71,19 @@ jobs:
           arguments: -no_logo -arch=x64 -host_arch=x64
           modifyEnvironment: true
 
-      - task: MSBuild@1
-        displayName: toolchain.msi
-        inputs:
-          solution: $(Build.SourcesDirectory)/swift-build/wix/windows-toolchain.wixproj
-          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:OutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:IntermediateOutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:TOOLCHAIN_ROOT=$(toolchain.directory)
+      - ${{ if eq(parameters.VERSION, '5.2') }}:
+        - task: MSBuild@1
+          displayName: toolchain.msi
+          inputs:
+            solution: $(Build.SourcesDirectory)/swift-build/wix/windows-toolchain.wixproj
+            msbuildArguments: /p:RunWixToolsOutOfProc=true -p:OutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:IntermediateOutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:TOOLCHAIN_ROOT=$(toolchain.directory) -p:INCLUDE_LLDB_PYTHON_SCRIPTS=false
+
+      - ${{ if ne(parameters.VERSION, '5.2') }}:
+        - task: MSBuild@1
+          displayName: toolchain.msi
+          inputs:
+            solution: $(Build.SourcesDirectory)/swift-build/wix/windows-toolchain.wixproj
+            msbuildArguments: /p:RunWixToolsOutOfProc=true -p:OutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:IntermediateOutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:TOOLCHAIN_ROOT=$(toolchain.directory) -p:INCLUDE_LLDB_PYTHON_SCRIPTS=true
 
       - publish: $(Build.BinariesDirectory)/toolchain-msi/toolchain.msi
         artifact: ${{ parameters.platform }}-toolchain-${{ parameters.proc }}.msi

.ci/vs2019-swift-5.2.yml

@@ -301,6 +301,8 @@ stages:
           os: Windows
           proc: amd64
 
+          VERSION: 5.2
+
   - stage: package_windows_sdk
     dependsOn: windows_sdk
     displayName: package SDK

wix/windows-toolchain.wixproj

@@ -25,7 +25,11 @@
   <Import Project="$(WixTargetsPath)" />
 
   <PropertyGroup>
-    <DefineConstants>TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;$(INCLUDE_DEBUG_INFO)</DefineConstants>
+    <INCLUDE_LLDB_PYTHON_SCRIPTS Condition=" '$(INCLUDE_LLDB_PYTHON_SCRIPTS)' == '' ">true</INCLUDE_LLDB_PYTHON_SCRIPTS>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;$(INCLUDE_DEBUG_INFO);INCLUDE_LLDB_PYTHON_SCRIPTS=$(INCLUDE_LLDB_PYTHON_SCRIPTS)</DefineConstants>
     <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
     <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
     <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>

wix/windows-toolchain.wxs

@@ -235,6 +235,7 @@
       </Component>
     </DirectoryRef>
 
+    <?if $(var.INCLUDE_LLDB_PYTHON_SCRIPTS) = true ?>
     <DirectoryRef Id="USR_LIB_SITE_PACKAGES_LLDB">
       <Component Id="LLDB_PYTHON_SCRIPTS" Guid="9205b430-21b1-4b50-ac91-cd41f3a0e050">
         <File Id="LLDB___INIT___PY" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\__init__.py" Checksum="yes" />
@@ -270,6 +271,7 @@
         <File Id="LLDB_UTILS_SYMBOLICATION_PY" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\symbolication.py" Checksum="yes" />
       </Component>
     </DirectoryRef>
+    <?endif?>
 
     <!-- TODO: install the block headers from Swift -->
     <!--
@@ -382,10 +384,12 @@
       <!--
       <ComponentGroupRef Id="SWIFT_SHIMS" />
       -->
+      <?if $(var.INCLUDE_LLDB_PYTHON_SCRIPTS) = true ?>
       <ComponentRef Id="LLDB_PYTHON_SCRIPTS" />
       <ComponentRef Id="LLDB_PYTHON_SCRIPTS_FORMATTERS" />
       <ComponentRef Id="LLDB_PYTHON_SCRIPTS_FORMATTERS_CPP" />
       <ComponentRef Id="LLDB_PYTHON_SCRIPTS_UTILS" />
+      <?endif?>
 
       <ComponentRef Id="ENV_VARS" />
     </Feature>