Include SwiftSyntaxCDataTypes.h in snapshot binary

* Include SwiftSyntaxCDataTypes.h in snapshot binary

The PR swiftlang/swift#39441 has split the SwiftSyntaxParser.h into two parts -
* SwiftSyntaxCDataTypes.h
* SwiftSyntaxParser.h

Include this file SwiftSyntaxCDataTypes.h from release 5.6+

Add the necessary plumbing via HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER
Ensure that this flag is set for the releases 5.6 onwards

Co-authored-by: Vivek <[email protected]>

Author: vivekg-ai

.ci/templates/toolchain-msi.yml

@@ -78,19 +78,26 @@ jobs:
             solution: $(Build.SourcesDirectory)/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
 
-      - ${{ if or(eq(parameters.VERSION, '5.5'), eq(parameters.VERSION, '5.6')) }}:
+      - ${{ if eq(parameters.VERSION, '5.5') }}:
         - task: MSBuild@1
           displayName: toolchain.msi
           inputs:
             solution: $(Build.SourcesDirectory)/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 -p:HAVE__INTERNAL_SWIFT_SYNTAX_PARSER=true -p:HAVE__INTERNAL_SWIFT_SCAN=true
 
+      - ${{ if eq(parameters.VERSION, '5.6') }}:
+        - task: MSBuild@1
+          displayName: toolchain.msi
+          inputs:
+            solution: $(Build.SourcesDirectory)/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 -p:HAVE__INTERNAL_SWIFT_SYNTAX_PARSER=true -p:HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER=true -p:HAVE__INTERNAL_SWIFT_SCAN=true
+
       - ${{ if and(ne(parameters.VERSION, '5.2'), ne(parameters.VERSION, '5.3'), ne(parameters.VERSION, '5.4'), ne(parameters.VERSION, '5.5'), ne(parameters.VERSION, '5.6')) }}:
         - task: MSBuild@1
           displayName: toolchain.msi
           inputs:
             solution: $(Build.SourcesDirectory)/wix/windows-toolchain.wixproj
-            msbuildArguments: /p:RunWixToolsOutOfProc=true -p:OutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:IntermediateOutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:DEVTOOLS_ROOT=$(devtools.directory) -p:TOOLCHAIN_ROOT=$(toolchain.directory) -p:INCLUDE_LLDB_PYTHON_SCRIPTS=true -p:HAVE__INTERNAL_SWIFT_SYNTAX_PARSER=true -p:HAVE__INTERNAL_SWIFT_SCAN=true -p:ENABLE_SWIFT_DRIVER=true
+            msbuildArguments: /p:RunWixToolsOutOfProc=true -p:OutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:IntermediateOutputPath=$(Build.BinariesDirectory)\toolchain-msi\ -p:DEVTOOLS_ROOT=$(devtools.directory) -p:TOOLCHAIN_ROOT=$(toolchain.directory) -p:INCLUDE_LLDB_PYTHON_SCRIPTS=true -p:HAVE__INTERNAL_SWIFT_SYNTAX_PARSER=true -p:HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER=true -p:HAVE__INTERNAL_SWIFT_SCAN=true -p:ENABLE_SWIFT_DRIVER=true
 
       - script: |
           signtool sign /f $(certificate.secureFilePath) /p "$(CERTIFICATE_PASSWORD)" /tr http://timestamp.digicert.com /fd sha256 /td sha256 $(Build.BinariesDirectory)/toolchain-msi/toolchain.msi

wix/windows-toolchain.wixproj

@@ -28,6 +28,7 @@
     <INCLUDE_LLDB_PYTHON_SCRIPTS Condition=" '$(INCLUDE_LLDB_PYTHON_SCRIPTS)' == '' ">true</INCLUDE_LLDB_PYTHON_SCRIPTS>
     <HAVE__INTERNAL_SWIFT_SCAN Condition=" '$(HAVE__INTERNAL_SWIFT_SCAN)' == '' ">false</HAVE__INTERNAL_SWIFT_SCAN>
     <HAVE__INTERNAL_SWIFT_SYNTAX_PARSER Condition=" '$(HAVE__INTERNAL_SWIFT_SYNTAX_PARSER)' == '' ">false</HAVE__INTERNAL_SWIFT_SYNTAX_PARSER>
+    <HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER Condition=" '$(HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER)' == '' ">false</HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER>
     <ENABLE_SWIFT_DRIVER Condition=" '$(ENABLE_SWIFT_DRIVER)' == '' ">false</ENABLE_SWIFT_DRIVER>
   </PropertyGroup>
 

wix/windows-toolchain.wxs

@@ -395,6 +395,9 @@
     <DirectoryRef Id="USR_INCLUDE__INTERNALSWIFTSYNTAXPARSER">
       <?if $(var.HAVE__INTERNAL_SWIFT_SYNTAX_PARSER) = true ?>
         <Component Id="_INTERNALSWIFTSYNTAXPARSER_HEADERS" Guid="751f758a-ee88-4be5-9285-97bbf3aa374a">
+          <?if $(var.HAVE__INTERNAL_SWIFT_SYNTAX_CTYPES_HEADER) = true ?>
+            <File Id="SWIFTSYNTAXCDATATYPES_H" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxCDataTypes.h" Checksum="yes" />
+          <?endif?>
           <File Id="SWIFTSYNTAXPARSER_H" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxParser.h" Checksum="yes" />
           <File Id="_INTERNALSWIFTSYNTAXPARSER_MODULE_MODULEMAP" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\module.modulemap" Checksum="yes" />
         </Component>