Skip to content

Commit f6fe5e3

Browse files
author
Mike Ferris
committed
Merge pull request #54 from modocache/build-script-deprecate-unused-parameters
[build_script.py] Deprecate obsolete parameters
2 parents 8af59ab + 2504684 commit f6fe5e3

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ If your install of Swift is located at `/swift` and you wish to install XCTest i
3838
./build_script.py \
3939
--swiftc="/swift/usr/bin/swiftc" \
4040
--build-dir="/tmp/XCTest_build" \
41-
--swift-build-dir="/swift/usr" \
42-
--arch="x86_64" \
4341
--library-install-path="/swift/usr/lib/swift/linux" \
4442
--module-install-path="/swift/usr/lib/swift/linux/x86_64"
4543
```
@@ -50,8 +48,6 @@ To run the tests on Linux, use the `--test` option:
5048
./build_script.py \
5149
--swiftc="/swift/usr/bin/swiftc" \
5250
--build-dir="/tmp/XCTest_build" \
53-
--swift-build-dir="/swift/usr" \
54-
--arch="x86_64" \
5551
--test
5652
```
5753

build_script.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
#
1111

12-
# Here is a nice way to invoke this script if you are building locally, and Swift is installed at /, and you want to install XCTest back there
13-
# sudo ./build_script.py --swiftc="/usr/bin/swiftc" --build-dir="/tmp/XCTest_build" --swift-build-dir="/usr" --library-install-path="/usr/lib/swift/linux" --module-install-path="/usr/lib/swift/linux/x86_64"
14-
1512
import os, subprocess, argparse
1613

1714
SOURCE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -34,13 +31,8 @@ def main():
3431
help="path to the output build directory",
3532
metavar="PATH",
3633
required=True)
37-
parser.add_argument("--swift-build-dir",
38-
help="path to the swift build directory",
39-
metavar="PATH",
40-
required=True)
41-
parser.add_argument("--arch",
42-
help="target architecture",
43-
required=True)
34+
parser.add_argument("--swift-build-dir", help="deprecated, do not use")
35+
parser.add_argument("--arch", help="deprecated, do not use")
4436
parser.add_argument("--module-install-path",
4537
help="location to install module files",
4638
metavar="PATH",
@@ -73,7 +65,6 @@ def main():
7365

7466
swiftc = os.path.abspath(args.swiftc)
7567
build_dir = os.path.abspath(args.build_dir)
76-
swift_build_dir = os.path.abspath(args.swift_build_dir)
7768

7869
if not os.path.exists(build_dir):
7970
run("mkdir -p {}".format(build_dir))

0 commit comments

Comments
 (0)