swift-llvm not necessary to run swift, so put in swift-llvm-git, create version out of tag

2 files changed, 11 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d64348122fc..9ef4f4a3a541 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = swift-llvm-git
-	pkgver = 10.0.1
-	pkgrel = 3
+	pkgver = swift.DEVELOPMENT.SNAPSHOT.2020.09.28.a.r106.ga3d312281b3d
+	pkgrel = 1
 	url = https://github.com/apple/swift-llvm
 	arch = x86_64
 	license = custom:Apache 2.0 with LLVM Exception
diff --git a/PKGBUILD b/PKGBUILD
index fa81fdc37e22..7d7f217538f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=('swift-llvm-git' 'swift-llvm-libs-git')
-instprefix="usr/lib/swift-git"
-pkgver=10.0.1
-pkgrel=3
+instprefix="usr/lib/swift-llvm-git"
+pkgver=swift.DEVELOPMENT.SNAPSHOT.2020.09.28.a.r106.ga3d312281b3d
+pkgrel=1
 arch=('x86_64')
 url="https://github.com/apple/swift-llvm"
 license=('custom:Apache 2.0 with LLVM Exception')
@@ -30,6 +30,12 @@ prepare() {
   rm test/tools/llvm-ar/error-opening-permission.test
 }
 
+pkgver() {
+    cd "$srcdir/llvm-project"
+    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+
 build() {
   cd "$srcdir/llvm-project/llvm/build"