Skip to content

SKCore: use PackageModel.BuildFlags instead of TSC #659

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 1 commit into from
Oct 25, 2022
Merged

SKCore: use PackageModel.BuildFlags instead of TSC #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ let package = Package(
"LanguageServerProtocol",
"LanguageServerProtocolJSONRPC",
"SKSupport",
.product(name: "SwiftPMDataModel-auto", package: "SwiftPM"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
exclude: ["CMakeLists.txt"]),
Expand Down
2 changes: 1 addition & 1 deletion Sources/SKCore/BuildSetup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import SKSupport

import struct TSCBasic.AbsolutePath
import struct TSCUtility.BuildFlags
import struct PackageModel.BuildFlags

/// Build configuration
public struct BuildSetup {
Expand Down
1 change: 1 addition & 0 deletions Sources/SKCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ target_link_libraries(SKCore PRIVATE
BuildServerProtocol
LanguageServerProtocol
LanguageServerProtocolJSONRPC
PackageModel
SKSupport
SourceKitD
TSCUtility)
2 changes: 1 addition & 1 deletion Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import LSPTestSupport
import class TSCBasic.Process
import func TSCBasic.resolveSymlinks
import struct TSCBasic.AbsolutePath
import struct TSCUtility.BuildFlags
import struct PackageModel.BuildFlags

public final class SKSwiftPMTestWorkspace {

Expand Down
2 changes: 1 addition & 1 deletion Sources/SKTestSupport/SKTibsTestWorkspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import LSPTestSupport

import struct TSCBasic.AbsolutePath
import enum TSCUtility.Platform
import struct TSCUtility.BuildFlags
import struct PackageModel.BuildFlags

public typealias URL = Foundation.URL

Expand Down
12 changes: 6 additions & 6 deletions Tests/SKCoreTests/FallbackBuildSystemTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import SKCore
import TSCBasic
import XCTest

import struct TSCUtility.BuildFlags
import struct PackageModel.BuildFlags

final class FallbackBuildSystemTests: XCTestCase {

Expand Down Expand Up @@ -50,7 +50,7 @@ final class FallbackBuildSystemTests: XCTestCase {
let sdk = AbsolutePath("/my/sdk")
let source = AbsolutePath("/my/source.swift")

let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(xswiftc: [
let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(swiftCompilerFlags: [
"-Xfrontend",
"-debug-constraints"
]))
Expand Down Expand Up @@ -79,7 +79,7 @@ final class FallbackBuildSystemTests: XCTestCase {
let sdk = AbsolutePath("/my/sdk")
let source = AbsolutePath("/my/source.swift")

let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(xswiftc: [
let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(swiftCompilerFlags: [
"-sdk",
"/some/custom/sdk",
"-Xfrontend",
Expand Down Expand Up @@ -135,7 +135,7 @@ final class FallbackBuildSystemTests: XCTestCase {
let sdk = AbsolutePath("/my/sdk")
let source = AbsolutePath("/my/source.cpp")

let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(xcxx: [
let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(cxxCompilerFlags: [
"-v"
]))
let bs = FallbackBuildSystem(buildSetup: buildSetup)
Expand All @@ -160,7 +160,7 @@ final class FallbackBuildSystemTests: XCTestCase {
let sdk = AbsolutePath("/my/sdk")
let source = AbsolutePath("/my/source.cpp")

let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(xcxx: [
let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(cxxCompilerFlags: [
"-isysroot",
"/my/custom/sdk",
"-v"
Expand Down Expand Up @@ -197,7 +197,7 @@ final class FallbackBuildSystemTests: XCTestCase {
func testCWithCustomFlags() {
let source = AbsolutePath("/my/source.c")

let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(xcc: [
let buildSetup = BuildSetup(configuration: .debug, path: nil, flags: BuildFlags(cCompilerFlags: [
"-v"
]))
let bs = FallbackBuildSystem(buildSetup: buildSetup)
Expand Down
4 changes: 2 additions & 2 deletions Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import SKTestSupport
import TSCBasic
import XCTest

import struct TSCUtility.BuildFlags
import struct PackageModel.BuildFlags

final class SwiftPMWorkspaceTests: XCTestCase {

Expand Down Expand Up @@ -153,7 +153,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
let config = BuildSetup(
configuration: .release,
path: packageRoot.appending(component: "non_default_build_path"),
flags: BuildFlags(xcc: ["-m32"], xcxx: [], xswiftc: ["-typecheck"], xlinker: []))
flags: BuildFlags(cCompilerFlags: ["-m32"], swiftCompilerFlags: ["-typecheck"]))

let ws = try! SwiftPMWorkspace(
workspacePath: packageRoot,
Expand Down