Skip to content
This repository has been archived by the owner on Aug 14, 2022. It is now read-only.

Commit

Permalink
Merge pull request #136 from vgorloff/develop
Browse files Browse the repository at this point in the history
RC 1.0.76
  • Loading branch information
vgorloff authored Dec 3, 2021
2 parents e37153f + 6e9b405 commit 66e2907
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.76] - 2021-12-03
* Updated to use Swift 5.5.1

## [1.0.75] - 2021-12-02
* Updated to use Xcode 13.

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.75
1.0.76
1 change: 1 addition & 0 deletions lib/Builders/DispatchBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ module.exports = class DispatchBuilder extends Builder {
-D CMAKE_INSTALL_PREFIX=/
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
-D ENABLE_TESTING=NO
-D ENABLE_SWIFT=YES
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/FoundationBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = class FoundationBuilder extends Builder {
-D CMAKE_INSTALL_PREFIX=/
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
-D ENABLE_TESTING=NO
-D CMAKE_Swift_COMPILER=${swift.paths.builds}/bin/swiftc
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/LLBBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ module.exports = class LLBBuilder extends Builder {
cd ${this.paths.builds} && cmake
-G Ninja
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
-D CMAKE_INSTALL_PREFIX=/
-D CMAKE_Swift_FLAGS="-Xlinker -v -Xfrontend -target -Xfrontend ${hostArch}-apple-macos10.10 -target ${hostArch}-apple-macos10.10 -v"
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/LLVMBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = class LLVMBuilder extends Builder {
-S ${this.paths.sources}/llvm
-B ${this.paths.builds}
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
-D LLVM_INCLUDE_EXAMPLES=false
-D LLVM_INCLUDE_TESTS=false
-D LLVM_INCLUDE_DOCS=false
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/SwiftDriverBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ module.exports = class SwiftDriverBuilder extends Builder {
-G Ninja
-D CMAKE_INSTALL_PREFIX=/
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
-D TSC_DIR=${tsc.paths.builds}/cmake/modules
-D LLBuild_DIR=${llb.paths.builds}/cmake/modules
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/SwiftStdLibBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ module.exports = class SwiftStdLibBuilder extends Builder {
-D SWIFT_ANDROID_${this.arch.swiftArch}_ICU_DATA=${icu.paths.lib}/libicudataswift.so
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
# build with the host compiler
-D SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER=YES
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/SwiftTSCBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ module.exports = class SwiftTSCBuilder extends Builder {
cd ${this.paths.builds} && cmake
-G Ninja
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
-D CMAKE_INSTALL_PREFIX=/
-D CMAKE_Swift_FLAGS="-sdk ${this.paths.xcMacOsSdkPath}"
${this.paths.sources}
Expand Down
1 change: 1 addition & 0 deletions lib/Builders/YAMSBuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module.exports = class YAMSBuilder extends Builder {
-G Ninja
-D CMAKE_INSTALL_PREFIX=/
-D CMAKE_BUILD_TYPE=Release
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.15
${this.paths.sources}
`;
this.executeCommands(cmd);
Expand Down
11 changes: 7 additions & 4 deletions lib/Git/Revision.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
// See also: $ToolChain/Sources/swift/utils/update_checkout/update-checkout-config.json

module.exports = {
// 1.0.76 - 11a4d5a4f54cdfb803b3c75e3c4dd5d2dfc1974c - tag:swift-5.5.1-RELEASE
// 1.0.74 - d2054e1c741f549caffbe1f286a9b11066b5c696 - tag:swift-5.5-RELEASE
// 1.0.73 - 282fe25d1757ff9974ade028d92111acdae6876a - tag:swift-5.4.3-RELEASE
// 1.0.71 - b666aa622e73a4f6d826a10d7ba8e5db302d1ec1 - tag:swift-5.4.2-RELEASE @ Thu Jun 24 23:34:53 2021 -0700
Expand All @@ -34,15 +35,16 @@ module.exports = {
// 1.0.62 - 253ea65ba72933c92850803f0c26aa768757b3ab - tag:swift-5.3.1-RELEASE @ 12. November 2020 at 09:17:14 CET
// 1.0.56 - e7c2f897ad2766b1664b56f3a77d939b844dd135 - tag:swift-5.3-RELEASE @ 11. September 2020 at 03:51:47 CEST
// 1.0.54 - 443e9a41d1a7c1fcae280490144fcbf8461d3499 - tag:swift-5.2-RELEASE @ 24. March 2020 at 19:15:32 CET
swift: "d2054e1c741f549caffbe1f286a9b11066b5c696",
swift: "11a4d5a4f54cdfb803b3c75e3c4dd5d2dfc1974c",

// 1.0.76 - e7c11bcb69c785c3470c91daf9c5d1b13162e7a6 - tag:swift-5.5.1-RELEASE
// 1.0.74 - 851fbd3cb89385ba733bc37d6149280996715898 - tag:swift-5.5-RELEASE
// 1.0.73 - f13ea5dcc055e5d2d7c02e90d8c9907ca9dc72e1 - tag:swift-5.4.3-RELEASE
// 1.0.68 - f13ea5dcc055e5d2d7c02e90d8c9907ca9dc72e1 - tag:swift-5.4-RELEASE @ Aug 14 14:49:59 2020 -0700
// 1.0.62 - 25ea083a3af4ca09eee2b6dbdf58f1b163f87008 - tag:swift-5.3.1-RELEASE @ 2. September 2020 at 09:28:48 CEST
// 1.0.56 - 25ea083a3af4ca09eee2b6dbdf58f1b163f87008 - tag:swift-5.3-RELEASE @ 2. September 2020 at 09:28:48 CEST
// 1.0.54 - c992dacf3ca114806e6ac9ffc9113b19255be9fe - tag:swift-5.2-RELEASE @ 1. October 2019 at 17:57:33 CEST
dispatch: "851fbd3cb89385ba733bc37d6149280996715898",
dispatch: "e7c11bcb69c785c3470c91daf9c5d1b13162e7a6",

// 1.0.74 - 5663ff1147d8f162f1cb44bfdb3e8c42addb7b69 - tag:swift-5.5-RELEASE
// 1.0.73 - dee1e194a44e660c205960adb470ea0981f78b49 - tag:swift-5.4.3-RELEASE
Expand All @@ -55,14 +57,15 @@ module.exports = {
// 1.0.54 - 8d0871530c52456278ef8c83cb049e6d70b28a6b - tag:swift-5.2-RELEASE @ 18. March 2020 at 08:25:12 CET
foundation: "5663ff1147d8f162f1cb44bfdb3e8c42addb7b69",

// 1.0.76 - 47e0531f53ce4508b522a28d407ac39b639781f4 - tag:swift-5.5.1-RELEASE
// 1.0.74 - fbf00809f11885f819457563beb069a2298b368f - tag:swift-5.5-RELEASE
// 1.0.73 - 8ee67e3af469eb38c9616f971abd5a47fe8d6405 - tag:swift-5.4.3-RELEASE
// 1.0.71 - 8ee67e3af469eb38c9616f971abd5a47fe8d6405 - tag:swift-5.4.2-RELEASE @ Thu May 27 16:18:16 2021 -0700
// 1.0.70 - cf0195a2f45d22e5e4487152f78fc077e5100dae - tag:swift-5.4.1-RELEASE @ Thu May 6 14:48:03 2021 -0700
// 1.0.67 - 439a44695a0534a26557cc34b4fe650dccb46aed - tag:swift-5.4-RELEASE @ 13. April 2021 at 19:37:22 CEST
// 1.0.62 - 3093af41dd65ad466dcd5603e9289244edfee4f5 - tag:swift-5.3.1-RELEASE @ 21. October 2020 at 01:10:23 CEST
// 1.0.56 - c39a810ec308dd4a8d93c5011fb73a5c987e8680 - tag:swift-5.3-RELEASE @ 10. September 2020 at 08:07:01 CEST
llvm: "fbf00809f11885f819457563beb069a2298b368f",
llvm: "47e0531f53ce4508b522a28d407ac39b639781f4",

// 1.0.74 - 9c8096a23f44794bde297452d87c455fc4f76d42 - tag:swift-5.5-RELEASE
// 1.0.73 - 9c8096a23f44794bde297452d87c455fc4f76d42 - tag:swift-5.4.3-RELEASE
Expand Down Expand Up @@ -128,6 +131,6 @@ module.exports = {
// 1.0.69 - 93e8b927225a62b963ebe13ab11e04192fa8a67b - tag:swift-5.4-RELEASE
sd: "12cd468c8182b4e1038268c664354005803fcdef",

// 1.0.74 - 0141f53dd525706c803b0c20aa8ad36f9ecd45e5 - tag:swift-5.5-RELEASE
// 1.0.74 - 0141f53dd525706c803b0c20aa8ad36f9ecd45e5 - tag:1.1.5
sc: "0141f53dd525706c803b0c20aa8ad36f9ecd45e5",
};

0 comments on commit 66e2907

Please sign in to comment.