Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-03-02 14:29:07 (GMT)
committerThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-03-05 16:54:02 (GMT)
commit86faf14f64aacab0479697f269196befc45b7048 (patch)
tree1d1d21a9ad047a5e5ee28ae98aa9b130c2ac0e64
parentab24440f9e30bcc46ca905d88f5e3cccbabbfbee (diff)
downloadswift-86faf14f64aacab0479697f269196befc45b7048.zip
swift-86faf14f64aacab0479697f269196befc45b7048.tar.bz2
Update the debian and ubuntu distributions
This patch updates the build scripts and documentation for newer distributions of Debian (9) and Ubuntu (17.10). Test-Information: Tested packaging scripts on Ubuntu 16.04.4 for Debian stretch and Ubuntu artful distributions. Change-Id: Id567d75bdf3c6abe3cf08a2fd617363a5c1c987f
Diffstat
-rw-r--r--README.md3
-rwxr-xr-xSwift/Packaging/Debian/Testing/swift-distr-tests.sh16
-rwxr-xr-xSwift/Packaging/Debian/package_all_platforms.sh2
-rw-r--r--Swift/Packaging/Debian/update_debian_repo.sh2
4 files changed, 15 insertions, 8 deletions
diff --git a/README.md b/README.md
index 1407683..f1b56bd 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,9 @@ Platforms we officially test our releases on are listed below. We only test on d
26* Swift 26* Swift
27 * Windows 7 to Windows 10 27 * Windows 7 to Windows 10
28 * Mac OS X 10.10 and Mac OS X 10.11 28 * Mac OS X 10.10 and Mac OS X 10.11
29 * Ubuntu 14.04 ( Trusty Tahr ) and Ubuntu 16.04 ( Xenial Xerus ) 29 * Ubuntu 17.10 ( Artful Aardvark ) and Ubuntu 16.04 ( Xenial Xerus )
30 * Debian 8 ( jessie ) 30 * Debian 8 ( jessie )
31 * Debian 9 ( stretch )
31 32
32## External Dependencies 33## External Dependencies
33The Swift repository includes some third party dependencies in the 3rdParty directory 34The Swift repository includes some third party dependencies in the 3rdParty directory
diff --git a/Swift/Packaging/Debian/Testing/swift-distr-tests.sh b/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
index 8d03282..e817974 100755
--- a/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
+++ b/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
@@ -40,25 +40,31 @@ arr[0,0]="ubuntu"
40arr[0,1]="http://archive.ubuntu.com/ubuntu" 40arr[0,1]="http://archive.ubuntu.com/ubuntu"
41arr[0,2]="xenial" 41arr[0,2]="xenial"
42 42
43#Ubuntu yakkety 43#Ubuntu artful
44arr[1,0]="ubuntu" 44arr[1,0]="ubuntu"
45arr[1,1]="http://archive.ubuntu.com/ubuntu" 45arr[1,1]="http://archive.ubuntu.com/ubuntu"
46arr[1,2]="yakkety" 46arr[1,2]="artful"
47 47
48#Debian jessie 48#Debian jessie
49arr[2,0]="debian" 49arr[2,0]="debian"
50arr[2,1]="http://deb.debian.org/debian/" 50arr[2,1]="http://deb.debian.org/debian/"
51arr[2,2]="jessie" 51arr[2,2]="jessie"
52 52
53#Debian sid 53#Debian stretch
54arr[3,0]="debian" 54arr[3,0]="debian"
55arr[3,1]="http://deb.debian.org/debian/" 55arr[3,1]="http://deb.debian.org/debian/"
56arr[3,2]="sid" 56arr[3,2]="stretch"
57
58#Debian sid
59arr[4,0]="debian"
60arr[4,1]="http://deb.debian.org/debian/"
61arr[4,2]="sid"
62
57 63
58DIST="$1" 64DIST="$1"
59RETURN_VALUE=0 65RETURN_VALUE=0
60 66
61for counter in {0..3} 67for counter in {0..4}
62do 68do
63# for ARCH in "amd64" "i386" 69# for ARCH in "amd64" "i386"
64 for ARCH in "amd64" 70 for ARCH in "amd64"
diff --git a/Swift/Packaging/Debian/package_all_platforms.sh b/Swift/Packaging/Debian/package_all_platforms.sh
index a61201d..afd0621 100755
--- a/Swift/Packaging/Debian/package_all_platforms.sh
+++ b/Swift/Packaging/Debian/package_all_platforms.sh
@@ -26,7 +26,7 @@ unset SWIFT_FORCE_LUCID
26 26
27if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ]; 27if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ];
28then 28then
29 platformsarray=( xenial yakkety jessie sid ) 29 platformsarray=( xenial artful jessie stretch sid )
30else 30else
31 platformsarray=( $SWIFT_PACKAGE_PLATFORMS ) 31 platformsarray=( $SWIFT_PACKAGE_PLATFORMS )
32fi 32fi
diff --git a/Swift/Packaging/Debian/update_debian_repo.sh b/Swift/Packaging/Debian/update_debian_repo.sh
index db9f326..b057103 100644
--- a/Swift/Packaging/Debian/update_debian_repo.sh
+++ b/Swift/Packaging/Debian/update_debian_repo.sh
@@ -74,7 +74,7 @@ command -v reprepro >/dev/null 2>&1 || { echo >&2 "This script requires aptly bu
74mkdir -p $APT_REPO_ROOT 74mkdir -p $APT_REPO_ROOT
75 75
76if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ]; then 76if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ]; then
77 platformsarray=( xenial yakkety jessie sid ) 77 platformsarray=( xenial artful jessie stretch sid )
78else 78else
79 platformsarray=( $SWIFT_PACKAGE_PLATFORMS ) 79 platformsarray=( $SWIFT_PACKAGE_PLATFORMS )
80fi 80fi