updated to generate based on version.hpp

3 files changed, 10 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c3fa13ebab6..a9d81b9ba7de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dout-git
 	pkgdesc = A C++ header library for minimalistic logging
-	pkgver = 1.0
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = http://github.com/slizzered/dout
 	arch = i686
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b8720e099543
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/pkg
+/src
+/dout-git*
diff --git a/PKGBUILD b/PKGBUILD
index e23b189e7062..85922e998b24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlchristian Eckert <carli-eckert at gmx dot de>
 
 pkgname=dout-git
-pkgver=1.0
+pkgver=1.0.1.r2.gd0d24e2
 pkgrel=1
 pkgdesc="A C++ header library for minimalistic logging"
 url="http://github.com/slizzered/${pkgname%-git}"
@@ -14,7 +14,11 @@ sha256sums=('SKIP')
 
 pkgver(){
     cd ${pkgname}
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+    RELEASE_MAJOR=$(grep -o "DOUT_VERSION_MAJOR [0-9]\+" include/dout/version.hpp | sed 's/[^0-9]//g')
+    RELEASE_MINOR=$(grep -o "DOUT_VERSION_MINOR [0-9]\+" include/dout/version.hpp | sed 's/[^0-9]//g')
+    RELEASE_PATCH=$(grep -o "DOUT_VERSION_PATCH [0-9]\+" include/dout/version.hpp | sed 's/[^0-9]//g')
+    REVISION=$(git describe --long --tags | sed 's/[0-9.]\+-//;s/\([^-]*-g\)/r\1/;s/-/./g')
+    echo ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_PATCH}.${REVISION}
 }
 
 build(){