Skip to content

Commit cee3f49

Browse files
shahmishalshahmishal
authored
Merge pull request swiftlang#77 from apple/add-support-for-version-dir
Add support for Swift version in the dir, and bump the version to Swi…
2 parents 4857636 + fa62152 commit cee3f49

File tree

6 files changed

+40
-38
lines changed

6 files changed

+40
-38
lines changed

Diff for: ‎platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec

+5-5
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ export VERBOSE=1
135135
swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-amazonlinux2.tar.gz
136136

137137
%install
138-
mkdir -p %{buildroot}%{_libexecdir}/swift/
139-
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
138+
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
139+
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
140140
mkdir -p %{buildroot}%{_bindir}
141-
ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
142-
ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
143-
ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
141+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
142+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
143+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
144144
mkdir -p %{buildroot}%{_mandir}/man1
145145
cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
146146

Diff for: ‎platforms/Linux/RPM/Centos/7/swiftlang.spec

+5-5
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ export VERBOSE=1
135135
swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos7.tar.gz
136136

137137
%install
138-
mkdir -p %{buildroot}%{_libexecdir}/swift/
139-
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
138+
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
139+
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
140140
mkdir -p %{buildroot}%{_bindir}
141-
ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
142-
ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
143-
ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
141+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
142+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
143+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
144144
mkdir -p %{buildroot}%{_mandir}/man1
145145
cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
146146

Diff for: ‎platforms/Linux/RPM/Centos/8/swiftlang.spec

+5-5
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,12 @@ export VERBOSE=1
137137
swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_builddir} installable_package=%{_builddir}/swift-%{version}-centos8.tar.gz
138138

139139
%install
140-
mkdir -p %{buildroot}%{_libexecdir}/swift/
141-
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
140+
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
141+
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
142142
mkdir -p %{buildroot}%{_bindir}
143-
ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
144-
ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
145-
ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
143+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
144+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
145+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
146146
mkdir -p %{buildroot}%{_mandir}/man1
147147
cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
148148

Diff for: ‎platforms/Linux/RPM/Fedora/34/swiftlang.spec

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
%global debug_package %{nil}
22
%global linux_version fedora
3-
%global swifttag 5.5.2-RELEASE
3+
%global swifttag 5.5.3-RELEASE
44
%global swiftbuild swift-source
55
%global icu_version 65-1
66
%global yams_version 4.0.2
77
%global sap_version 0.4.3
88
%global swift_crypto_version 1.1.5
99
%global ninja_version 1.10.2
10+
%global package_version 5.5.3
1011

1112
Name: swiftlang
12-
Version: 5.5.2
13+
Version: 5.5.3
1314
Release: 1%{?dist}
14-
Summary: Apple's Swift programming language
15-
License: ASL 2.0 and Unicode
16-
URL: https://swift.org
15+
Summary: The Swift programming language
16+
License: Apache 2.0
17+
URL: https://www.swift.org
1718

1819
Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz
1920
Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz
@@ -142,12 +143,12 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil
142143

143144

144145
%install
145-
mkdir -p %{buildroot}%{_libexecdir}/swift/
146-
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
146+
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
147+
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
147148
mkdir -p %{buildroot}%{_bindir}
148-
ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
149-
ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
150-
ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
149+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
150+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
151+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
151152
mkdir -p %{buildroot}%{_mandir}/man1
152153
cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
153154

Diff for: ‎platforms/Linux/RPM/Fedora/35/swiftlang.spec

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
%global debug_package %{nil}
22
%global linux_version fedora
3-
%global swifttag 5.5.2-RELEASE
3+
%global swifttag 5.5.3-RELEASE
44
%global swiftbuild swift-source
55
%global icu_version 65-1
66
%global yams_version 4.0.2
77
%global sap_version 0.4.3
88
%global swift_crypto_version 1.1.5
99
%global ninja_version 1.10.2
10+
%global package_version 5.5.3
1011

1112
Name: swiftlang
12-
Version: 5.5.2
13+
Version: 5.5.3
1314
Release: 1%{?dist}
14-
Summary: Apple's Swift programming language
15-
License: ASL 2.0 and Unicode
16-
URL: https://swift.org
15+
Summary: The Swift programming language
16+
License: Apache 2.0
17+
URL: https://www.swift.org
1718

1819
Source0: https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz
1920
Source1: https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz
@@ -142,12 +143,12 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil
142143

143144

144145
%install
145-
mkdir -p %{buildroot}%{_libexecdir}/swift/
146-
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift
146+
mkdir -p %{buildroot}%{_libexecdir}/swift/%{package_version}
147+
cp -r %{_builddir}/usr/* %{buildroot}%{_libexecdir}/swift/%{package_version}
147148
mkdir -p %{buildroot}%{_bindir}
148-
ln -fs %{_libexecdir}/swift/bin/swift %{buildroot}%{_bindir}/swift
149-
ln -fs %{_libexecdir}/swift/bin/swiftc %{buildroot}%{_bindir}/swiftc
150-
ln -fs %{_libexecdir}/swift/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
149+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swift %{buildroot}%{_bindir}/swift
150+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/swiftc %{buildroot}%{_bindir}/swiftc
151+
ln -fs %{_libexecdir}/swift/%{package_version}/bin/sourcekit-lsp %{buildroot}%{_bindir}/sourcekit-lsp
151152
mkdir -p %{buildroot}%{_mandir}/man1
152153
cp %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/man1/swift.1
153154

Diff for: ‎platforms/Linux/RPM/metadata.inc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# package metadata
22

33
%global package_name swiftlang
4-
%global package_version 5.5.2
4+
%global package_version 5.5.3
55
%global package_summary The Swift programming language
66
%global package_license Apache 2.0
7-
%global package_url https://swift.org
7+
%global package_url https://www.swift.org
88

99
# versions
1010

11-
%global swift_version 5.5.2-RELEASE
11+
%global swift_version 5.5.3-RELEASE
1212
%global icu_version 65-1
1313
%global yams_version 4.0.2
1414
%global swift_argument_parser_version 0.4.3

0 commit comments

Comments
 (0)