update to DEVELOPMENT-SNAPSHOT-2020-06-29-a

2 files changed, 55 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abf57538228a..c95997f0bb08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed May  3 22:53:29 UTC 2017
 pkgbase = swift-development
 	pkgdesc = The Swift programming language and debugger - latest development snapshot
-	pkgver = DEVELOPMENT.SNAPSHOT.2017.04.24.a
+	pkgver = DEVELOPMENT.SNAPSHOT.2020.06.29.a
 	pkgrel = 1
 	url = http://swift.org/
 	arch = i686
@@ -18,7 +16,7 @@ pkgbase = swift-development
 	makedepends = python2-sphinx
 	makedepends = python2-requests
 	makedepends = rsync
-	depends = python2
+	depends = python
 	depends = libutil-linux
 	depends = icu
 	depends = libbsd
@@ -28,34 +26,28 @@ pkgbase = swift-development
 	depends = ncurses
 	depends = libkqueue
 	depends = libblocksruntime
-	source = swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-llvm-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-clang-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-lldb-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-cmark-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-llbuild-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-package-manager-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-corelibs-libdispatch-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2017-04-24-a.tar.gz
-	source = libpwq-18437d2be372f4422b207ec6442c8caf7974025d.tar.gz::https://github.com/mheily/libpwq/archive/18437d2be372f4422b207ec6442c8caf7974025d.tar.gz
-	source = sourcekit_link_order.patch
-	source = icu59.patch
-	sha256sums = 494d69f05d711e8df08cc7a7183e3f9735e091bc12bda7000ba5d6108c1c3275
-	sha256sums = 30dd5dbe9fa2247bc02a2150fdd4bc874d98f5cf15f179a7134bff664cc05667
-	sha256sums = 2e4379158a6170c8602aab69efe21553a6847cb06747dc20ebea8028d9512ace
-	sha256sums = e488bf6a9fe4d2b5813ca9263134a198341aa50c5f92be1117d96bd4421aedc2
-	sha256sums = eb1cdc5d8b6192cc3b77356c30c203c6f7d60202e91af3920fa4c087f5ba38d4
-	sha256sums = 6909e33f2de65967b8b378d49c85169338db0b360c954ed490ea167920c3d8f7
-	sha256sums = fc815e12e435eba96dab858596403bc1d0e5a069471da4a8dfc1a99de374785f
-	sha256sums = 812be01ed103624a49a9cc722b77ecd0c237b61412604de881dabe47abbe984a
-	sha256sums = 4cffca269ab81ce725143c1c630de1b4ab385b79f49dd8c1c9bf41cd31f7bb6b
-	sha256sums = 38fe4ec76f99477f4ed3e1a769e3d5fd9671b3daa9f5a4005d6252845b8a5b5f
-	sha256sums = 392055443e04515a5c94a1ab736d6959ce2354ac2ee8418c8bf3dc2124240969
-	sha256sums = d6290d649d25230813cd27dbad49ea0b68bb9302df76c3fdd0f24ebc8b1b5b00
-	sha256sums = c9aa6e167a57ed31002471204d39bf24bb4ebecc38322571515ac73f02b237b6
-	sha256sums = 3fedb626b375f6ad8b4601abd336f4560718a9c9134716f0c3a4e823b8c12857
+	source = swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-clang-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-clang/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-cmark-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-cmark/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-corelibs-xctest-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-corelibs-foundation-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-corelibs-libdispatch-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-integration-tests-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-llbuild-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-lldb-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-lldb/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-llvm-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-llvm/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	source = swift-package-manager-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-DEVELOPMENT-SNAPSHOT-2020-06-29-a.tar.gz
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = swift-development
 	pkgdesc = The Swift programming language compiler and tools - development snapshot
diff --git a/PKGBUILD b/PKGBUILD
index 85fea291ea5a..6de908d22986 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,85 +2,64 @@
 
 pkgbase=swift-development
 pkgname=(swift-development swift-lldb-development)
-_swiftver=DEVELOPMENT-SNAPSHOT-2017-04-24-a
+_swiftver=DEVELOPMENT-SNAPSHOT-2020-06-29-a
 pkgver=${_swiftver//-/.}
 pkgrel=1
 pkgdesc="The Swift programming language and debugger - latest development snapshot"
 arch=('i686' 'x86_64')
 url="http://swift.org/"
 license=('apache')
-depends=('python2' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
-         'sqlite' 'ncurses' 'libkqueue' 'libblocksruntime')
+depends=('python' 'libutil-linux' 'icu' 'libbsd' 'libedit' 'libxml2'
+         'sqlite' 'ncurses')
 makedepends=('git' 'cmake' 'ninja' 'swig' 'clang>=3.8' 'python2-six' 'perl'
              'python2-sphinx' 'python2-requests' 'rsync')
 
 _libpwq_ref=18437d2be372f4422b207ec6442c8caf7974025d
 source=(
     "swift-${_swiftver}.tar.gz::https://github.com/apple/swift/archive/swift-${_swiftver}.tar.gz"
-    "swift-llvm-${_swiftver}.tar.gz::https://github.com/apple/swift-llvm/archive/swift-${_swiftver}.tar.gz"
-    "swift-clang-${_swiftver}.tar.gz::https://github.com/apple/swift-clang/archive/swift-${_swiftver}.tar.gz"
-    "swift-lldb-${_swiftver}.tar.gz::https://github.com/apple/swift-lldb/archive/swift-${_swiftver}.tar.gz"
     "swift-cmark-${_swiftver}.tar.gz::https://github.com/apple/swift-cmark/archive/swift-${_swiftver}.tar.gz"
-    "swift-llbuild-${_swiftver}.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-${_swiftver}.tar.gz"
-    "swift-package-manager-${_swiftver}.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-xctest-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-xctest/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-foundation-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-foundation/archive/swift-${_swiftver}.tar.gz"
     "swift-corelibs-libdispatch-${_swiftver}.tar.gz::https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${_swiftver}.tar.gz"
     "swift-integration-tests-${_swiftver}.tar.gz::https://github.com/apple/swift-integration-tests/archive/swift-${_swiftver}.tar.gz"
-    "libpwq-${_libpwq_ref}.tar.gz::https://github.com/mheily/libpwq/archive/${_libpwq_ref}.tar.gz"
-    "sourcekit_link_order.patch"
-    "icu59.patch"
+    "swift-llbuild-${_swiftver}.tar.gz::https://github.com/apple/swift-llbuild/archive/swift-${_swiftver}.tar.gz"
+    "llvm-project-${_swiftver}.tar.gz::https://github.com/apple/llvm-project/archive/swift-${_swiftver}.tar.gz"
+    "swift-package-manager-${_swiftver}.tar.gz::https://github.com/apple/swift-package-manager/archive/swift-${_swiftver}.tar.gz"
+)
+sha256sums=(
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
 )
-sha256sums=('494d69f05d711e8df08cc7a7183e3f9735e091bc12bda7000ba5d6108c1c3275'
-            '30dd5dbe9fa2247bc02a2150fdd4bc874d98f5cf15f179a7134bff664cc05667'
-            '2e4379158a6170c8602aab69efe21553a6847cb06747dc20ebea8028d9512ace'
-            'e488bf6a9fe4d2b5813ca9263134a198341aa50c5f92be1117d96bd4421aedc2'
-            'eb1cdc5d8b6192cc3b77356c30c203c6f7d60202e91af3920fa4c087f5ba38d4'
-            '6909e33f2de65967b8b378d49c85169338db0b360c954ed490ea167920c3d8f7'
-            'fc815e12e435eba96dab858596403bc1d0e5a069471da4a8dfc1a99de374785f'
-            '812be01ed103624a49a9cc722b77ecd0c237b61412604de881dabe47abbe984a'
-            '4cffca269ab81ce725143c1c630de1b4ab385b79f49dd8c1c9bf41cd31f7bb6b'
-            '38fe4ec76f99477f4ed3e1a769e3d5fd9671b3daa9f5a4005d6252845b8a5b5f'
-            '392055443e04515a5c94a1ab736d6959ce2354ac2ee8418c8bf3dc2124240969'
-            'd6290d649d25230813cd27dbad49ea0b68bb9302df76c3fdd0f24ebc8b1b5b00'
-            'c9aa6e167a57ed31002471204d39bf24bb4ebecc38322571515ac73f02b237b6'
-            '3fedb626b375f6ad8b4601abd336f4560718a9c9134716f0c3a4e823b8c12857')
 
 prepare() {
-    # Use python2 where appropriate
-    find "$srcdir" -type f -print0 | \
-         xargs -0 sed -i 's|/usr/bin/env python$|&2|'
-    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" \
-         "$srcdir/swift-swift-${_swiftver}/test/sil-passpipeline-dump/basic.test-sh"
+    # not sure where diagnostics is included, pip install it
+    pip install diagnostics
 
     # Use directory names which build-script expects
-    for sdir in llvm clang lldb cmark llbuild; do
-        ln -sf swift-${sdir}-swift-${_swiftver} ${sdir}
+    rm -rf llvm-project
+    ln -sf llvm-project-swift-${_swiftver} llvm-project
+
+    for sdir in cmark llbuild
+    do
+        rm -rf ${sdir}
+        mv swift-${sdir}-swift-${_swiftver} ${sdir}
     done
     for sdir in corelibs-xctest corelibs-foundation corelibs-libdispatch \
                 integration-tests
     do
-        ln -sf swift-${sdir}-swift-${_swiftver} swift-${sdir}
+        rm -rf swift-${sdir}
+        mv swift-${sdir}-swift-${_swiftver} swift-${sdir}
     done
-    ln -sf swift-swift-${_swiftver} swift
-    ln -sf swift-package-manager-swift-${_swiftver} swiftpm
-
-    # Put libpwq in the right submodule location
-    rmdir swift-corelibs-libdispatch/libpwq
-    mv libpwq-${_libpwq_ref} swift-corelibs-libdispatch/libpwq
-
-    # Fix library link order for sourcekitd-test
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/sourcekit_link_order.patch" )
-
-    # ICU 59 changed the type of UChar to char16_t
-    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/icu59.patch" )
+    rm -rf swift swiftpm
+    mv swift-swift-${_swiftver} swift
+    mv swift-package-manager-swift-${_swiftver} swiftpm
 }
 
 _common_build_params=(