Skip to content

Revert "Add a dynamic and static library product of SwiftSyntax to Package.swift" #27

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
Nov 4, 2018
Merged

Revert "Add a dynamic and static library product of SwiftSyntax to Package.swift" #27

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
16 changes: 12 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ import PackageDescription

let package = Package(
name: "SwiftSyntax",
products: [
.library(name: "SwiftSyntax", targets: ["SwiftSyntax"]),
.library(name: "SwiftSyntax-dynamic", type: .dynamic, targets: ["SwiftSyntax"]),
],
targets: [
.target(name: "SwiftSyntax"),
.testTarget(name: "SwiftSyntaxTest", dependencies: ["SwiftSyntax"], exclude: ["Inputs"]),
.target(name: "lit-test-helper", dependencies: ["SwiftSyntax"])
]
)

#if os(Linux)
import Glibc
#else
import Darwin.C
#endif

if getenv("SWIFT_SYNTAX_BUILD_SCRIPT") == nil {
package.products.append(.library(name: "SwiftSyntax", targets: ["SwiftSyntax"]))
} else {
package.products.append(.library(name: "SwiftSyntax", type: .dynamic, targets: ["SwiftSyntax"]))
}
3 changes: 2 additions & 1 deletion build-script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def build_swiftsyntax(swift_build_exec, swiftc_exec, build_dir, build_test_util,
swiftpm_call = get_swiftpm_invocation(spm_exec=swift_build_exec,
build_dir=build_dir,
release=release)
swiftpm_call.extend(['--product', 'SwiftSyntax-dynamic'])
swiftpm_call.extend(['--product', 'SwiftSyntax'])

# Only build lit-test-helper if we are planning to run tests
if build_test_util:
Expand All @@ -163,6 +163,7 @@ def build_swiftsyntax(swift_build_exec, swiftc_exec, build_dir, build_test_util,
swiftpm_call.extend(['--verbose'])
_environ = dict(os.environ)
_environ['SWIFT_EXEC'] = swiftc_exec
_environ['SWIFT_SYNTAX_BUILD_SCRIPT'] = ''
check_call(swiftpm_call, env=_environ, verbose=verbose)


Expand Down