Skip to content

Commit e60a50f

Browse files
sinorusinoru
committed
Align swiftenv-build works with Swift 3.x
1 parent 688ba4f commit e60a50f

File tree

8 files changed

+286
-37
lines changed

8 files changed

+286
-37
lines changed

‎libexec/swiftenv-build‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,10 @@ build_swift() {
4242
echo "Building Swift"
4343
echo "This may take a very long time..."
4444

45-
./utils/build-script -R -- --install-prefix="$destination" >&4 2>&1
45+
./utils/build-script $@ install_destdir="$destination" >&4 2>&1
4646
cd "$TMP"
4747
}
4848

49-
install_swift() {
50-
mkdir -p "$destination/usr/bin"
51-
cp "$TMP/build/Ninja-ReleaseAssert/"swift-*/bin/swift{,-demangle} "$destination/usr/bin"
52-
}
53-
5449
build_failed() {
5550
{ echo "Building Swift failed"
5651
echo "Check out the logfile for more information: $LOG_PATH"
@@ -132,7 +127,6 @@ fi
132127
mkdir -p "$destination"
133128
trap build_failed ERR
134129
source "$PACKAGE_DEFINITION"
135-
install_swift
136130

137131
if $clean; then
138132
rm -fr $TMP

‎share/swiftenv-build/2.2‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
1-
fetch_git swift swift-2.2-RELEASE swift
2-
fetch_git swift-llvm swift-2.2-RELEASE llvm
3-
fetch_git swift-clang swift-2.2-RELEASE clang
4-
fetch_git swift-lldb swift-2.2-RELEASE lldb
5-
fetch_git swift-cmark swift-2.2-RELEASE cmark
6-
build_swift
1+
TAG="swift-2.2-RELEASE"
2+
fetch_git swift $TAG swift
3+
fetch_git swift-llvm $TAG llvm
4+
fetch_git swift-clang $TAG clang
5+
fetch_git swift-lldb $TAG lldb
6+
fetch_git swift-cmark $TAG cmark
7+
8+
cat > $TMP/swift-build-presets.ini << "EOF"
9+
[preset: mixin_lightweight_assertions]
10+
assertions
11+
no-swift-stdlib-assertions
12+
dash-dash
13+
swift-enable-ast-verifier=0
14+
15+
[preset: swiftenv]
16+
mixin-preset=mixin_lightweight_assertions
17+
18+
lldb
19+
release
20+
dash-dash
21+
build-swift-static-stdlib=1
22+
skip-test-lldb=1
23+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
24+
install-swift
25+
install-lldb
26+
install-prefix=/usr
27+
install-destdir=%(install_destdir)s
28+
reconfigure
29+
EOF
30+
31+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

‎share/swiftenv-build/2.2-dev‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
1-
fetch_git swift swift-2.2-branch swift
2-
fetch_git swift-llvm swift-2.2-branch llvm
3-
fetch_git swift-clang swift-2.2-branch clang
4-
fetch_git swift-lldb swift-2.2-branch lldb
5-
fetch_git swift-cmark swift-2.2-branch cmark
6-
build_swift
1+
BRANCH="swift-2.2-branch"
2+
fetch_git swift $BRANCH swift
3+
fetch_git swift-llvm $BRANCH llvm
4+
fetch_git swift-clang $BRANCH clang
5+
fetch_git swift-lldb $BRANCH lldb
6+
fetch_git swift-cmark $BRANCH cmark
7+
8+
cat > $TMP/swift-build-presets.ini << "EOF"
9+
[preset: mixin_lightweight_assertions]
10+
assertions
11+
no-swift-stdlib-assertions
12+
dash-dash
13+
swift-enable-ast-verifier=0
14+
15+
[preset: swiftenv]
16+
mixin-preset=mixin_lightweight_assertions
17+
18+
lldb
19+
release
20+
dash-dash
21+
build-swift-static-stdlib=1
22+
skip-test-lldb=1
23+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
24+
install-swift
25+
install-lldb
26+
install-prefix=/usr
27+
install-destdir=%(install_destdir)s
28+
reconfigure
29+
EOF
30+
31+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

‎share/swiftenv-build/2.2.1‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
1-
fetch_git swift swift-2.2.1-RELEASE swift
2-
fetch_git swift-llvm swift-2.2.1-RELEASE llvm
3-
fetch_git swift-clang swift-2.2.1-RELEASE clang
4-
fetch_git swift-lldb swift-2.2.1-RELEASE lldb
5-
fetch_git swift-cmark swift-2.2.1-RELEASE cmark
6-
build_swift
1+
TAG="swift-2.2.1-RELEASE"
2+
fetch_git swift $TAG swift
3+
fetch_git swift-llvm $TAG llvm
4+
fetch_git swift-clang $TAG clang
5+
fetch_git swift-lldb $TAG lldb
6+
fetch_git swift-cmark $TAG cmark
7+
8+
cat > $TMP/swift-build-presets.ini << "EOF"
9+
[preset: mixin_lightweight_assertions]
10+
assertions
11+
no-swift-stdlib-assertions
12+
dash-dash
13+
swift-enable-ast-verifier=0
14+
15+
[preset: swiftenv]
16+
mixin-preset=mixin_lightweight_assertions
17+
18+
lldb
19+
release
20+
dash-dash
21+
build-swift-static-stdlib=1
22+
skip-test-lldb=1
23+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
24+
install-swift
25+
install-lldb
26+
install-prefix=/usr
27+
install-destdir=%(install_destdir)s
28+
reconfigure
29+
EOF
30+
31+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

‎share/swiftenv-build/3.0‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
TAG="swift-3.0-RELEASE"
2+
fetch_git swift $TAG swift
3+
fetch_git swift-llvm $TAG llvm
4+
fetch_git swift-clang $TAG clang
5+
fetch_git swift-lldb $TAG lldb
6+
fetch_git swift-cmark $TAG cmark
7+
fetch_git swift-llbuild $TAG llbuild
8+
fetch_git swift-package-manager $TAG swiftpm
9+
fetch_git swift-compiler-rt $TAG compiler-rt
10+
fetch_git swift-corelibs-xctest $TAG swift-corelibs-xctest
11+
fetch_git swift-corelibs-foundation $TAG swift-corelibs-foundation
12+
fetch_git swift-corelibs-libdispatch $TAG swift-corelibs-libdispatch
13+
14+
cat > $TMP/swift-build-presets.ini << "EOF"
15+
[preset: mixin_lightweight_assertions]
16+
assertions
17+
no-swift-stdlib-assertions
18+
dash-dash
19+
swift-enable-ast-verifier=0
20+
21+
[preset: swiftenv]
22+
mixin-preset=mixin_lightweight_assertions
23+
24+
llbuild
25+
swiftpm
26+
xctest
27+
lldb
28+
release
29+
foundation
30+
libdispatch
31+
dash-dash
32+
build-swift-static-stdlib
33+
build-swift-static-sdk-overlay
34+
build-swift-stdlib-unittest-extra
35+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
36+
install-swift
37+
install-lldb
38+
install-llbuild
39+
install-swiftpm
40+
install-xctest
41+
install-foundation
42+
install-libdispatch
43+
install-prefix=/usr
44+
install-destdir=%(install_destdir)s
45+
reconfigure
46+
EOF
47+
48+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

‎share/swiftenv-build/3.0-dev‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,48 @@
1-
fetch_git swift master swift
2-
fetch_git swift-compiler-rt stable compiler-rt
3-
fetch_git swift-llvm stable llvm
4-
fetch_git swift-clang stable clang
5-
fetch_git swift-lldb master lldb
6-
fetch_git swift-cmark master cmark
7-
fetch_git swift-package-manager master swiftpm
8-
fetch_git swift-llbuild master llbuild
9-
fetch_git swift-corelibs-xctest master swift-corelibs-xctest
10-
fetch_git swift-corelibs-foundation master swift-corelibs-foundation
11-
fetch_git swift-corelibs-libdispatch master swift-corelibs-libdispatch
12-
build_swift
1+
BRANCH="swift-3.0-branch"
2+
fetch_git swift $BRANCH swift
3+
fetch_git swift-llvm $BRANCH llvm
4+
fetch_git swift-clang $BRANCH clang
5+
fetch_git swift-lldb $BRANCH lldb
6+
fetch_git swift-cmark $BRANCH cmark
7+
fetch_git swift-llbuild $BRANCH llbuild
8+
fetch_git swift-package-manager $BRANCH swiftpm
9+
fetch_git swift-compiler-rt $BRANCH compiler-rt
10+
fetch_git swift-corelibs-xctest $BRANCH swift-corelibs-xctest
11+
fetch_git swift-corelibs-foundation $BRANCH swift-corelibs-foundation
12+
fetch_git swift-corelibs-libdispatch $BRANCH swift-corelibs-libdispatch
13+
14+
cat > $TMP/swift-build-presets.ini << "EOF"
15+
[preset: mixin_lightweight_assertions]
16+
assertions
17+
no-swift-stdlib-assertions
18+
dash-dash
19+
swift-enable-ast-verifier=0
20+
21+
[preset: swiftenv]
22+
mixin-preset=mixin_lightweight_assertions
23+
24+
llbuild
25+
swiftpm
26+
xctest
27+
lldb
28+
release
29+
foundation
30+
libdispatch
31+
dash-dash
32+
build-swift-static-stdlib
33+
build-swift-static-sdk-overlay
34+
build-swift-stdlib-unittest-extra
35+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
36+
install-swift
37+
install-lldb
38+
install-llbuild
39+
install-swiftpm
40+
install-xctest
41+
install-foundation
42+
install-libdispatch
43+
install-prefix=/usr
44+
install-destdir=%(install_destdir)s
45+
reconfigure
46+
EOF
47+
48+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

‎share/swiftenv-build/3.0.1‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
TAG="swift-3.0.1-RELEASE"
2+
fetch_git swift $TAG swift
3+
fetch_git swift-llvm $TAG llvm
4+
fetch_git swift-clang $TAG clang
5+
fetch_git swift-lldb $TAG lldb
6+
fetch_git swift-cmark $TAG cmark
7+
fetch_git swift-llbuild $TAG llbuild
8+
fetch_git swift-package-manager $TAG swiftpm
9+
fetch_git swift-compiler-rt $TAG compiler-rt
10+
fetch_git swift-corelibs-xctest $TAG swift-corelibs-xctest
11+
fetch_git swift-corelibs-foundation $TAG swift-corelibs-foundation
12+
fetch_git swift-corelibs-libdispatch $TAG swift-corelibs-libdispatch
13+
14+
cat > $TMP/swift-build-presets.ini << "EOF"
15+
[preset: mixin_lightweight_assertions]
16+
assertions
17+
no-swift-stdlib-assertions
18+
dash-dash
19+
swift-enable-ast-verifier=0
20+
21+
[preset: swiftenv]
22+
mixin-preset=mixin_lightweight_assertions
23+
24+
llbuild
25+
swiftpm
26+
xctest
27+
lldb
28+
release
29+
foundation
30+
libdispatch
31+
dash-dash
32+
build-swift-static-stdlib
33+
build-swift-static-sdk-overlay
34+
build-swift-stdlib-unittest-extra
35+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
36+
install-swift
37+
install-lldb
38+
install-llbuild
39+
install-swiftpm
40+
install-xctest
41+
install-foundation
42+
install-libdispatch
43+
install-prefix=/usr
44+
install-destdir=%(install_destdir)s
45+
reconfigure
46+
EOF
47+
48+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

‎share/swiftenv-build/3.1-dev‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
BRANCH="swift-3.1-branch"
2+
fetch_git swift $BRANCH swift
3+
fetch_git swift-llvm $BRANCH llvm
4+
fetch_git swift-clang $BRANCH clang
5+
fetch_git swift-lldb $BRANCH lldb
6+
fetch_git swift-cmark $BRANCH cmark
7+
fetch_git swift-llbuild $BRANCH llbuild
8+
fetch_git swift-package-manager $BRANCH swiftpm
9+
fetch_git swift-compiler-rt $BRANCH compiler-rt
10+
fetch_git swift-corelibs-xctest $BRANCH swift-corelibs-xctest
11+
fetch_git swift-corelibs-foundation $BRANCH swift-corelibs-foundation
12+
fetch_git swift-corelibs-libdispatch $BRANCH swift-corelibs-libdispatch
13+
14+
cat > $TMP/swift-build-presets.ini << "EOF"
15+
[preset: mixin_lightweight_assertions]
16+
assertions
17+
no-swift-stdlib-assertions
18+
dash-dash
19+
swift-enable-ast-verifier=0
20+
21+
[preset: swiftenv]
22+
mixin-preset=mixin_lightweight_assertions
23+
24+
llbuild
25+
swiftpm
26+
xctest
27+
lldb
28+
release
29+
foundation
30+
libdispatch
31+
dash-dash
32+
build-swift-static-stdlib
33+
build-swift-static-sdk-overlay
34+
build-swift-stdlib-unittest-extra
35+
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
36+
install-swift
37+
install-lldb
38+
install-llbuild
39+
install-swiftpm
40+
install-xctest
41+
install-foundation
42+
install-libdispatch
43+
install-prefix=/usr
44+
install-destdir=%(install_destdir)s
45+
reconfigure
46+
EOF
47+
48+
build_swift --preset=file=swift/utils/build-presets.ini --preset-file=$TMP/swift-build-presets.ini --preset=swiftenv

0 commit comments

Comments
 (0)