Fix tests

2 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2af34cb4b7e6..0ff764d92964 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = ndn-cxx-git
 	pkgdesc = Library implementing Named Data Networking (NDN) primitives that can be used to write various NDN applications
-	pkgver = ndn.cxx.0.7.0.r47.g483087f5
-	pkgrel = 3
+	pkgver = 0.7.0.r47.g483087f5
+	pkgrel = 2
 	url = https://github.com/named-data/ndn-cxx
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = python
-	makedepends = sqlite
-	makedepends = openssl>=1.0.2
+	makedepends = doxygen
+	makedepends = python-sphinx
 	depends = boost
+	depends = sqlite
+	depends = openssl>=1.0.2
 	optdepends = boost-stacktrace-backtrace
 	provides = ndn-cxx
 	conflicts = ndn-cxx
diff --git a/PKGBUILD b/PKGBUILD
index 2ea9c4cd4d82..44e0af84d153 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 _reponame=ndn-cxx
 _pkgname=ndn-cxx
 pkgname=${_pkgname}-git
-pkgver=ndn.cxx.0.7.0.r47.g483087f5
-pkgrel=3
+pkgver=0.7.0.r47.g483087f5
+pkgrel=2
 # epoch=
 pkgdesc="Library implementing Named Data Networking (NDN) primitives that can be used to write various NDN applications"
 arch=('i686' 'x86_64')
 url="https://github.com/named-data/${_reponame}"
 license=('GPL')
 groups=()
-depends=('boost')
-makedepends=('git' 'python' 'sqlite' 'openssl>=1.0.2')
+depends=('boost' 'sqlite' 'openssl>=1.0.2')
+makedepends=('git' 'python' 'doxygen' 'python-sphinx')
 checkdepends=()
 optdepends=('boost-stacktrace-backtrace')
 provides=("${_pkgname}")
@@ -27,7 +27,7 @@ validpgpkeys=()
 
 pkgver() {
 	cd "${srcdir}/${_reponame}"
-	git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long | sed 's/^ndn.cxx.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -38,13 +38,14 @@ prepare() {
 build() {
   cd "${srcdir}/${_reponame}"
 	./waf build
+  ./waf docs
 }
 
-#check() {
-#  2>&1 echo "Tests can be skipped with the --nocheck argument in makepkg"
-#  cd "${srcdir}/${_reponame}"
-#  ./build/unit-tests
-#}
+#check() {                                    
+#  cd "${srcdir}/${_reponame}-${pkgver}"                          
+#  ./waf install --destdir="${srcdir}/tests"   
+#  LD_LIBRARY_PATH="${srcdir}/tests/usr/lib" ./build/unit-tests   
+#}    
 
 package() {
 	cd "${srcdir}/${_reponame}"