Skip to content

Commit 6bcfebf

Browse files
committed
Updating to 5.1.1
Signed-off-by: Van Simmons <rvsrvs@gmail.com>
1 parent 70bd5ad commit 6bcfebf

7 files changed

Lines changed: 25 additions & 23 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.bz2
33
*.gz
44
*.pkg
5+
*.pkg.zip
56
tmp_*
67
cache*
78
swift-checkout
@@ -12,4 +13,4 @@ Destinations
1213
SDKs
1314
Toolchains
1415
**/.build
15-
16+
Packages/*

Configurations/5.1.1-RELEASE/amd64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"archName": "amd64",
3-
"version": "5.1.0",
3+
"version": "5.1.1",
44
"toolchainSuffix": "RELEASE",
55
"targetArch": "x86_64",
66
"gnuExtension": "",
77
"installerDir": "./InstallPackagers/SwiftCrossCompiler/Developer",
88
"cachePath": "/tmp",
9-
"macToolchain": "https://swift.org/builds/swift-5.1-release/xcode/swift-5.1-RELEASE/swift-5.1-RELEASE-osx.pkg",
10-
"targetToolchain": "https://swift.org/builds/swift-5.1-release/ubuntu1804/swift-5.1-RELEASE/swift-5.1-RELEASE-ubuntu18.04.tar.gz",
9+
"macToolchain": "https://swift.org/builds/swift-5.1.1-release/xcode/swift-5.1.1-RELEASE/swift-5.1.1-RELEASE-osx.pkg",
10+
"targetToolchain": "https://swift.org/builds/swift-5.1.1-release/ubuntu1804/swift-5.1.1-RELEASE/swift-5.1.1-RELEASE-ubuntu18.04.tar.gz",
1111
"binutilsSource": "https://ftp.gnu.org/gnu/binutils/binutils-2.31.tar.gz",
1212
"packageMirror": "http://archive.ubuntu.com/ubuntu",
1313
"packageSources": [

Configurations/5.1.1-RELEASE/arm64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"archName": "arm64",
3-
"version": "5.1.0",
3+
"version": "5.1.1",
44
"toolchainSuffix": "RELEASE",
55
"targetArch": "aarch64",
66
"gnuExtension": "",
77
"installerDir": "./InstallPackagers/SwiftCrossCompiler/Developer",
88
"cachePath": "/tmp",
9-
"macToolchain": "https://swift.org/builds/swift-5.1-release/xcode/swift-5.1-RELEASE/swift-5.1-RELEASE-osx.pkg",
10-
"targetToolchain": "https://github.com/futurejones/swift-arm64/releases/download/v5.1-RELEASE/swift-5.1-aarch64-RELEASE-Ubuntu-18.04_2019-09-21.tar.gz",
9+
"macToolchain": "https://swift.org/builds/swift-5.1.1-release/xcode/swift-5.1.1-RELEASE/swift-5.1.1-RELEASE-osx.pkg",
10+
"targetToolchain": "https://github.com/futurejones/swift-arm64/releases/download/v5.1.1-RELEASE/swift-5.1.1-aarch64-RELEASE-Ubuntu-18.04_2019-10-18.tar.gz",
1111
"binutilsSource": "https://ftp.gnu.org/gnu/binutils/binutils-2.31.tar.gz",
1212
"packageMirror": "http://ports.ubuntu.com/ubuntu-ports",
1313
"packageSources": [

Configurations/5.1.1-RELEASE/armv7.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"archName": "armhf",
3-
"version": "5.1.0",
3+
"version": "5.1.1",
44
"toolchainSuffix": "RELEASE",
55
"targetArch": "armv7",
66
"gnuExtension": "eabihf",
77
"installerDir": "./InstallPackagers/SwiftCrossCompiler/Developer",
88
"cachePath": "/tmp",
9-
"macToolchain": "https://swift.org/builds/swift-5.1-release/xcode/swift-5.1-RELEASE/swift-5.1-RELEASE-osx.pkg",
10-
"targetToolchain": "https://github.com/uraimo/buildSwiftOnARM/releases/download/5.1/swift-5.1-armv7-Ubuntu1804.tgz",
9+
"macToolchain": "https://swift.org/builds/swift-5.1.1-release/xcode/swift-5.1.1-RELEASE/swift-5.1.1-RELEASE-osx.pkg",
10+
"targetToolchain": "https://github.com/uraimo/buildSwiftOnARM/releases/download/5.1.1/swift-5.1.1-armv7-Ubuntu1804.tgz",
1111
"binutilsSource": "https://ftp.gnu.org/gnu/binutils/binutils-2.31.tar.gz",
1212
"packageMirror": "http://ports.ubuntu.com/ubuntu-ports",
1313
"packageSources": [

InstallPackagers/SwiftCrossCompiler/SwiftCrossCompiler.pkgproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@
435435
</dict>
436436
<key>PAYLOAD_TYPE</key>
437437
<integer>0</integer>
438+
<key>PRESERVE_EXTENDED_ATTRIBUTES</key>
439+
<false/>
438440
<key>SHOW_INVISIBLE</key>
439441
<false/>
440442
<key>SPLIT_FORKS</key>
@@ -468,7 +470,7 @@
468470
<key>FOLLOW_SYMBOLIC_LINKS</key>
469471
<false/>
470472
<key>IDENTIFIER</key>
471-
<string>com.computecycles.pkg.SwiftCrossCompiler</string>
473+
<string>com.computecycles.pkg.SwiftCrossCompiler-armv7</string>
472474
<key>LOCATION</key>
473475
<integer>0</integer>
474476
<key>NAME</key>
@@ -484,7 +486,7 @@
484486
<key>USE_HFS+_COMPRESSION</key>
485487
<false/>
486488
<key>VERSION</key>
487-
<string>5.1</string>
489+
<string>5.1.1</string>
488490
</dict>
489491
<key>TYPE</key>
490492
<integer>0</integer>
@@ -797,7 +799,7 @@
797799
</dict>
798800
</array>
799801
<key>NAME</key>
800-
<string>Swift Cross Compiler</string>
802+
<string>SwiftCrossCompiler</string>
801803
<key>PAYLOAD_ONLY</key>
802804
<true/>
803805
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

build_cross_compiler

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,17 +256,16 @@ fi
256256

257257
cd "$dest"
258258

259-
rm -rf $cross_sdk_basename/$linux_sdk_name
259+
rm -rf $cross_sdk_basename/*
260260
mkdir -p "$cross_sdk_basename/$linux_sdk_name"
261261

262-
rm -rf $cross_tc_basename/$xc_tc_name
262+
rm -rf $cross_tc_basename/*
263263
mkdir -p "$cross_tc_basename/$xc_tc_name"
264264

265-
rm -rf $cross_destination_basename/$destination_name
265+
rm -rf $cross_destination_basename/*
266266
mkdir -p "$cross_destination_basename"
267267

268-
rm -rf $cross_runtime_basename/$ARCH_NAME-$VERSION_NUMBER
269-
rm -rf $cross_runtime_basename/${ARCH_NAME}-${VERSION_NUMBER}-runtime.tar.gz
268+
rm -rf $cross_runtime_basename/*
270269
mkdir -p "$cross_runtime_basename/$ARCH_NAME-$VERSION_NUMBER"
271270

272271
# --- Fetch Linux Platform SDK Package Specifications -----------------------

echoserver/Package.resolved

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)