Update version and create working install

2 files changed, 97 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 247187630490..0d9760b072dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan  5 00:13:12 UTC 2016
+# Fri Jan  8 21:39:09 UTC 2016
 pkgbase = swift
 	pkgdesc = The Swift programming language and debugger
-	pkgver = 2.2.SNAPSHOT.2015.12.31.a
+	pkgver = 2.2.SNAPSHOT.2016.01.06.a
 	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
@@ -21,29 +21,30 @@ pkgbase = swift
 	depends = libxml2
 	depends = sqlite
 	depends = ncurses
+	depends = python2-six
 	provides = lldb
 	provides = swift-language
 	conflicts = lldb
 	conflicts = swift-language-git
 	conflicts = swift-git
-	source = swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	source = swift-llvm-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	source = swift-clang-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	source = swift-lldb-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
+	source = swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	source = swift-llvm-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	source = swift-clang-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	source = swift-lldb-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
 	source = cmark::git+https://github.com/apple/swift-cmark.git
-	source = swift-llbuild-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	source = swift-package-manager-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	source = swift-corelibs-xctest-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	source = swift-corelibs-foundation-2.2-SNAPSHOT-2015-12-31-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-2.2-SNAPSHOT-2015-12-31-a.tar.gz
-	sha256sums = d899e995c9cfa8987e470f0ad799f311ba9d8ae54ca889c4a22e60ac44bea26a
-	sha256sums = 4730fb75898110ed892d4cc35f2f58b457879c51283b19cccf797c443b3bc05e
-	sha256sums = 9660637e380472e3c30244d43f0d56499483a10dd960a8ae5323a0ba374152a2
-	sha256sums = 7dae0792aac2657c939637e3850a64483d1c2ce56e2164331abc26142379ed04
+	source = swift-llbuild-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	source = swift-package-manager-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	source = swift-corelibs-xctest-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	source = swift-corelibs-foundation-2.2-SNAPSHOT-2016-01-06-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-2.2-SNAPSHOT-2016-01-06-a.tar.gz
+	sha256sums = 929d5dda152ebfb31afe6c27cf9c641a3d033a8b54cf459090403cc655c59e76
+	sha256sums = ae29efd1c0797f2cd8f68d4a74bcc5639afadbbd13c8873e5d5d79c59e0d7a9a
+	sha256sums = e7095f1b19e81370ba91e9d5319849ba9aaa4ebc25bbc93524497ddcec987339
+	sha256sums = 4ed1fe8f696e36b4b5528d68fe34c53dc79794f274dc64334667a1b378749ddc
 	sha256sums = SKIP
-	sha256sums = 9a39dfdc5c018e404df2f7d065629963b4efd8f3005de9728e61905ca307847b
-	sha256sums = 6dd619bd8a4fd6109adb1577f48d38b9f16911324ff3fd6f10959653cdcd3ffd
-	sha256sums = 5a1965af767e6a1fb9ccd0da90acc2db6050c417fb5da49d4f9be5f32e23a984
-	sha256sums = dd4cbae758d42ad4f1f08d19455e092cab118c1c636c99abebbadc3517e253e5
+	sha256sums = 3d922644a0f1b1b2c412b306cf0efa6e1f32b251f89a88d354f6983c1a92a9e1
+	sha256sums = 7d969dbcf75b312701b8e2be473ec15952d133f5d5ae7b42fbfa42a296222cda
+	sha256sums = 20e3cedfe23a5057dbd4a226dc5fe3e8aba473115cec35fe6de7ff925178c901
+	sha256sums = 4d29ae29261699fe6a3c039be71ee17a5fc77c04f01fe68cf87070b20ad17818
 
 pkgname = swift
 
diff --git a/PKGBUILD b/PKGBUILD
index a0dbf406ee30..5fd19a0a73a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=swift
-_swiftver=2.2-SNAPSHOT-2015-12-31-a
+_swiftver=2.2-SNAPSHOT-2016-01-06-a
 pkgver=${_swiftver//-/.}
 pkgrel=1
 pkgdesc="The Swift programming language and debugger"
@@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
 url="http://swift.org/"
 license=('apache')
 depends=('python2' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
-         'sqlite' 'ncurses')
+         'sqlite' 'ncurses' 'python2-six')
 makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.6')
 provides=('lldb' 'swift-language')
 conflicts=('lldb' 'swift-language-git' 'swift-git')
@@ -23,15 +23,15 @@ source=(
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
 )
 sha256sums=(
-    'd899e995c9cfa8987e470f0ad799f311ba9d8ae54ca889c4a22e60ac44bea26a'
-    '4730fb75898110ed892d4cc35f2f58b457879c51283b19cccf797c443b3bc05e'
-    '9660637e380472e3c30244d43f0d56499483a10dd960a8ae5323a0ba374152a2'
-    '7dae0792aac2657c939637e3850a64483d1c2ce56e2164331abc26142379ed04'
+    '929d5dda152ebfb31afe6c27cf9c641a3d033a8b54cf459090403cc655c59e76'
+    'ae29efd1c0797f2cd8f68d4a74bcc5639afadbbd13c8873e5d5d79c59e0d7a9a'
+    'e7095f1b19e81370ba91e9d5319849ba9aaa4ebc25bbc93524497ddcec987339'
+    '4ed1fe8f696e36b4b5528d68fe34c53dc79794f274dc64334667a1b378749ddc'
     'SKIP'
-    '9a39dfdc5c018e404df2f7d065629963b4efd8f3005de9728e61905ca307847b'
-    '6dd619bd8a4fd6109adb1577f48d38b9f16911324ff3fd6f10959653cdcd3ffd'
-    '5a1965af767e6a1fb9ccd0da90acc2db6050c417fb5da49d4f9be5f32e23a984'
-    'dd4cbae758d42ad4f1f08d19455e092cab118c1c636c99abebbadc3517e253e5'
+    '3d922644a0f1b1b2c412b306cf0efa6e1f32b251f89a88d354f6983c1a92a9e1'
+    '7d969dbcf75b312701b8e2be473ec15952d133f5d5ae7b42fbfa42a296222cda'
+    '20e3cedfe23a5057dbd4a226dc5fe3e8aba473115cec35fe6de7ff925178c901'
+    '4d29ae29261699fe6a3c039be71ee17a5fc77c04f01fe68cf87070b20ad17818'
 )
 
 prepare() {
@@ -41,18 +41,23 @@ prepare() {
     find "$srcdir/swift-lldb-swift-${_swiftver}" -name Makefile -print0 | \
          xargs -0 sed -i 's|python-config|python2-config|g'
     sed -i '/^cmake_minimum_required/a set(Python_ADDITIONAL_VERSIONS 2.7)' \
+         "$srcdir/swift-swift-${_swiftver}/CMakeLists.txt"
+    sed -i '/^cmake_minimum_required/a set(Python_ADDITIONAL_VERSIONS 2.7)' \
          "$srcdir/swift-lldb-swift-${_swiftver}/CMakeLists.txt"
+    sed -i 's/\<python\>/&2/' \
+         "$srcdir/swift-swift-${_swiftver}/utils/build-script-impl"
 
     # Fix bad include paths
     find "$srcdir" -type f -print0 | \
          xargs -0 sed -i 's|/usr/include/x86_64-linux-gnu|/usr/include|g'
 
     # Use directory names which build-script expects
-    for sdir in llvm clang lldb llbuild; do
-        ln -sf swift-${sdir}-swift-${_swiftver} ${sdir}
-    done
-    for sdir in xctest foundation; do
-        ln -sf swift-corelibs-${sdir}-swift-${_swiftver} swift-corelibs-${sdir}
+    for sdir in llvm clang lldb llbuild corelibs-xctest corelibs-foundation; do
+        if [[ "$sdir" =~ ^corelibs- ]]; then
+            ln -sf swift-${sdir}-swift-${_swiftver} swift-${sdir}
+        else
+            ln -sf swift-${sdir}-swift-${_swiftver} ${sdir}
+        fi
     done
     ln -sf swift-swift-${_swiftver} swift
     ln -sf swift-package-manager-swift-${_swiftver} swiftpm
@@ -71,17 +76,67 @@ build() {
 check() {
     cd "$srcdir/swift"
 
-    # TODO: Run tests
-    #export SWIFT_SOURCE_ROOT="$srcdir"
-    #utils/build-script -t
+    export SWIFT_SOURCE_ROOT="$srcdir"
+    utils/build-script -R -t
 }
 
 package() {
-    cd "$srcdir/build"
+    cd "$srcdir/build/Ninja-ReleaseAssert"
+
+    # Install swift-capable lldb
+    (
+        cd lldb-linux-$CARCH
+        DESTDIR="$pkgdir" ninja install
+    )
+
+    # Swift's components don't provide an install target :(
+    # These are based on what's included in the binary release packages
+    (
+        cd swift-linux-$CARCH
+        install -m755 bin/swift bin/swift-demangle bin/swift-compress "$pkgdir/usr/bin"
+        ln -s swift "$pkgdir/usr/bin/swiftc"
+        ln -s swift "$pkgdir/usr/bin/swift-autolink-extract"
+
+        install -dm755 "$pkgdir/usr/share/man/man1"
+        install -m644 docs/tools/swift.1 "$pkgdir/usr/share/man/man1"
+        gzip "$pkgdir/usr/share/man/man1/swift.1"
+
+        umask 0022
+        install -dm755 "$pkgdir/usr/lib/swift"
+        cp -rL lib/swift/{clang,glibc,linux,shims} "$pkgdir/usr/lib/swift/"
+    )
+    (
+        cd llbuild-linux-$CARCH
+        install -m755 bin/swift-build-tool "$pkgdir/usr/bin"
+    )
+    (
+        cd swiftpm-linux-$CARCH
+        install -m755 debug/swift-build "$pkgdir/usr/bin"
+
+        install -dm755 "$pkgdir/usr/lib/swift/pm"
+        install -m755 lib/swift/pm/libPackageDescription.so "$pkgdir/usr/lib/swift/pm"
+        install -m644 lib/swift/pm/PackageDescription.swiftmodule "$pkgdir/usr/lib/swift/pm"
+    )
+    (
+        cd foundation-linux-$CARCH
+        install -m755 Foundation/libFoundation.so "$pkgdir/usr/lib/swift/linux/"
+        install -m644 Foundation/Foundation.swiftdoc "$pkgdir/usr/lib/swift/linux/$CARCH"
+        install -m644 Foundation/Foundation.swiftmodule "$pkgdir/usr/lib/swift/linux/$CARCH"
+
+        umask 0022
+        cp -r Foundation/usr/lib/swift/CoreFoundation "$pkgdir/usr/lib/swift/"
+    )
+    (
+        cd xctest-linux-$CARCH
+        install -m755 libXCTest.so "$pkgdir/usr/lib/swift/linux/"
+        install -m644 XCTest.swiftdoc "$pkgdir/usr/lib/swift/linux/$CARCH"
+        install -m644 XCTest.swiftmodule "$pkgdir/usr/lib/swift/linux/$CARCH"
+    )
 
-    install -d -m755 "$pkgdir/usr"
-    cp -R Ninja-ReleaseAssert "$pkgdir/usr"
+    # License file
+    install -dm755 "$pkgdir/usr/share/licenses/swift"
+    install -m644 "$srcdir/swift/LICENSE.txt" "$pkgdir/usr/share/licenses/swift"
 
-    # Ensure correct directory permissions
-    find "$pkgdir" -type d -exec chmod 755 {} +
+    # This should be provided from python2-six
+    rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"
 }