Skip to content

Update Windows Toolchain Build for LSP to Include SwiftSyntax #61595

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

Jump to bottom
Merged
merged 1 commit into from
Oct 20, 2022
Merged

Update Windows Toolchain Build for LSP to Include SwiftSyntax #61595

merged 1 commit into from
Oct 20, 2022

Conversation

CodaFi
Copy link
Contributor

@CodaFi CodaFi commented Oct 17, 2022

Pairs well with swiftlang/sourcekit-lsp#651

@CodaFi CodaFi requested a review from compnerd October 17, 2022 00:06
stevapple
stevapple suggested changes Oct 17, 2022
View reviewed changes
compnerd
compnerd reviewed Oct 17, 2022
View reviewed changes
Copy link
Member

@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.

Agreed with @stevapple - we currently are not building SwiftSyntax, and this will need to introduce that build and shuffle the dependencies accordingly.

@CodaFi CodaFi force-pushed the syn-city branch 3 times, most recently from b19e8cd to 98c847a Compare October 17, 2022 16:07
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 17, 2022

Thanks @stevapple. How does it look now?

@stevapple
Copy link
Contributor

It looks like SwiftSyntax exports its module in cmake instead of cmake/modules, so the path should be changed. I don’t know why it diverges from other libraries though.

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 18, 2022

That's an artifact of the brutal hacks we need to get the syntax library linking right. I've updated things on the LSP end so they'll accept and interpret the base path correctly.

stevapple
stevapple reviewed Oct 18, 2022
View reviewed changes
utils/build-windows-toolchain.bat Outdated
@@ -635,11 +656,12 @@ cmake ^
-D SwiftPM_DIR=%BuildRoot%\14\cmake\modules ^
-D IndexStoreDB_DIR=%BuildRoot%\15\cmake\modules ^
-D SwiftCollections_DIR=%BuildRoot%\13\cmake\modules ^
-D SwiftSyntax_DIR=%BuildRoot%\16 ^
Copy link
Contributor

Choose a reason for hiding this comment

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

If I wasn’t misunderstanding the CMakeLists…

Suggested change
-D SwiftSyntax_DIR=%BuildRoot%\16 ^
-D SwiftSyntax_DIR=%BuildRoot%\16\cmake ^

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not any more. This is accounted for in the cmake for LSP

compnerd
compnerd approved these changes Oct 20, 2022
View reviewed changes
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 20, 2022

@swift-ci smoke test

@CodaFi CodaFi merged commit a072cc8 into swiftlang:main Oct 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stevapple stevapple stevapple requested changes

@compnerd compnerd compnerd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CodaFi @stevapple @compnerd