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.

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

Conversation

vivekg-ai
Copy link
Contributor

@vivekg-ai vivekg-ai commented Feb 23, 2022

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+

Copy link
Owner

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't really a snapshot binary. This is the installer manifest - it is used for both snapshots and releases. Unless the short description was meant to be that it actually only applies to 5.7?

@@ -395,6 +395,7 @@
<DirectoryRef Id="USR_INCLUDE__INTERNALSWIFTSYNTAXPARSER">
<?if $(var.HAVE__INTERNAL_SWIFT_SYNTAX_PARSER) = true ?>
<Component Id="_INTERNALSWIFTSYNTAXPARSER_HEADERS" Guid="751f758a-ee88-4be5-9285-97bbf3aa374a">
<File Id="SWIFTSYNTAXCDATATYPES_H" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxCDataTypes.h" Checksum="yes" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this file been there since the beginning of time? The installer manifests are shared across versions, and we still have active builds on older releases. Could you please verify that this file exists in 5.3+?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new file existence details as below -
5.3
5.4
5.5
5.6 ✔️

So this file started appearing from 5.6 onwards.

@vivekg-ai
Copy link
Contributor Author

This isn't really a snapshot binary. This is the installer manifest - it is used for both snapshots and releases. Unless the short description was meant to be that it actually only applies to 5.7?

Yeah, I meant it for the 5.7 snapshot. I will correct the description.

@compnerd
Copy link
Owner

Ah, seems that it was 5.6+ - we should fix this in the 5.6 builds as well. Take a look at: https://github.com/compnerd/swift-build/blob/master/.ci/templates/toolchain-msi.yml#L81-L86
That condition will need to be split, and we can introduce a new HAVE_SWIFT_SYNTAX_CTYPES_HEADER option to include that. That will need to be plumbed through https://github.com/compnerd/swift-build/blob/master/wix/windows-toolchain.wixproj#L27-L35 into the file that you already identified.

vivekg-ai and others added 2 commits February 23, 2022 23:10
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
Copy link
Owner

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@compnerd compnerd merged commit 73aaf49 into compnerd:master Feb 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants