Skip to content

Commit 8e0ec0e

Browse files
authored
Merge pull request #1660 from TTOzzi/main
Created an Examples-all target to include all the example targets, and updated build_script.py.
2 parents d14176d + 319e9c2 commit 8e0ec0e

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

Examples/Package.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,19 @@ let package = Package(
4040
),
4141
]
4242
)
43+
44+
// This is a fake target that depends on all targets in the package.
45+
// We need to define it manually because the `Examples-Package` target doesn't exist for `swift build`.
46+
47+
package.targets.append(
48+
.target(
49+
name: "Examples-all",
50+
dependencies: package.targets.compactMap {
51+
if $0.type == .test {
52+
return nil
53+
} else {
54+
return .byName(name: $0.name)
55+
}
56+
}
57+
)
58+
)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// This is a fake target that depends on all targets in the package.
2+
// We need to define it manually because the `Examples-Package` target doesn't exist for `swift build`.

build-script.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ def buildProduct(self, product_name: str) -> None:
218218
print("** Building product " + product_name + " **")
219219
self.__build(PACKAGE_DIR, product_name, is_product=True)
220220

221-
def buildTarget(self, target_name: str) -> None:
221+
def buildTarget(self, package_dir: str, target_name: str) -> None:
222222
print("** Building target " + target_name + " **")
223-
self.__build(PACKAGE_DIR, target_name, is_product=False)
223+
self.__build(package_dir, target_name, is_product=False)
224224

225225
def buildExample(self, example_name: str) -> None:
226226
print("** Building example " + example_name + " **")
@@ -504,11 +504,8 @@ def build_command(args: argparse.Namespace) -> None:
504504
verbose=args.verbose,
505505
disable_sandbox=args.disable_sandbox,
506506
)
507-
builder.buildTarget("SwiftSyntax-all")
508-
509-
# Build examples
510-
builder.buildExample("AddOneToIntegerLiterals")
511-
builder.buildExample("CodeGenerationUsingSwiftSyntaxBuilder")
507+
builder.buildTarget(PACKAGE_DIR, "SwiftSyntax-all")
508+
builder.buildTarget(EXAMPLES_DIR, "Examples-all")
512509
except subprocess.CalledProcessError as e:
513510
fail_for_called_process_error("Building SwiftSyntax failed", e)
514511

0 commit comments

Comments
 (0)