[arch-commits] Commit in dub/trunk (PKGBUILD)

[Михаил Страшун]

    Date: Sunday, February 15, 2015 @ 14:13:19
  Author: dicebot
Revision: 127741

upgpkg: dub v0.9.22.r198.g83b2926-1

Rebuilds on specific commit from current master to include changes
that allow more robust detection of installed D compiler and make
end user experience much more straightforward.

Modified:
  dub/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-15 10:32:14 UTC (rev 127740)
+++ PKGBUILD	2015-02-15 13:13:19 UTC (rev 127741)
@@ -1,11 +1,11 @@
 # Maintainer:  Mihails Strasuns <public at dicebot.lv>
 # Contributor: Moritz Maxeiner <moritz at ucworks.org>
 pkgname=dub
-pkgver=0.9.22
-pkgrel=2
+pkgver=v0.9.22.r198.g83b2926
+pkgrel=1
 pkgdesc="Developer package manager for D programming language"
 arch=('i686' 'x86_64')
-url="https://github.com/rejectedsoftware/dub"
+url="https://github.com/D-Programming-Language/dub"
 license=('MIT')
 # makedepends=('d-compiler' 'd-runtime' 'git')
 makedepends=('ldc' 'git')
@@ -13,14 +13,22 @@
 depends=('liblphobos')
 conflicts=('dub-git')
 source=(
-    "git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver"
-    "git+https://github.com/Dicebot/Arch-PKGBUILDs.git"
+  "git+https://github.com/D-Programming-Language/dub.git#commit=83b2926f7ba88122be85a8841cedb854b0e3a630"
+  "git+https://github.com/Dicebot/Arch-PKGBUILDs.git"
 )
 sha256sums=(
-    'SKIP'
-    'SKIP'
+  'SKIP'
+  'SKIP'
 )
 
+pkgver() {
+  cd "$srcdir/$pkgname"
+  ( set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
+}
+
 build()
 {
   # DC=`$srcdir/Arch-PKGBUILDs/d-compiler.sh`
@@ -29,9 +37,11 @@
 
   echo Generating version file...
   GITVER=$(git describe) || GITVER=unknown
-  echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d
+  echo "module dub.version_;" > source/dub/version_.d
+  echo "enum dubVersion = \"$GITVER\";" >> source/dub/version_.d
+  echo "enum initialCompilerBinary = \"$DC\";" >> source/dub/version_.d
 
-  $DC -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt
+  $DC -ofbin/dub -w -g -version=DubUseCurl -Isource -L-lcurl @build-files.txt
 }
 
 package()