Skip to content

Include SwiftSyntaxCDataTypes.h in snapshot binary #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 23, 2022
Merged

Include SwiftSyntaxCDataTypes.h in snapshot binary #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b896992
Include SwiftSyntaxCDataTypes.h in snapshot binary
vivekg-ai Feb 23, 2022
dd473f2
Include the SwiftSyntaxCDataType.h from 5.6 onward
vivekgalatage Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .ci/templates/toolchain-msi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions wix/windows-toolchain.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 3 additions & 0 deletions wix/windows-toolchain.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down