Update to support ANTLR parser

2 files changed, 34 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 889e1676c51b..b28a9a4d29cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,27 @@
 pkgbase = python-fasm-git
 	pkgdesc = FPGA Assembly (FASM) Parser and Generation library
-	pkgver = 0.0.r47.g4857dde
+	pkgver = 0.0.r86.gbae2e6d
 	pkgrel = 1
 	url = https://github.com/SymbiFlow/fasm
-	arch = any
+	arch = x86_64
 	license = ISC
 	checkdepends = python-pytest
 	makedepends = git
 	makedepends = python-setuptools
+	makedepends = cython
+	makedepends = cmake
+	makedepends = antlr4
 	depends = python
 	depends = python-textx
-	provides = python-fasm=0.0.r47.g4857dde
+	depends = antlr4-runtime
+	provides = python-fasm=0.0.r86.gbae2e6d
 	conflicts = fasm
 	conflicts = python-fasm
 	source = git+https://github.com/SymbiFlow/fasm.git
+	source = git+https://github.com/antlr/antlr4
+	source = git+https://github.com/google/googletest
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = python-fasm-git
diff --git a/PKGBUILD b/PKGBUILD
index 24e34a980715..47b605f3a720 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,23 @@
 
 _pkgname=fasm
 pkgname="python-$_pkgname-git"
-pkgver=0.0.r47.g4857dde
+pkgver=0.0.r86.gbae2e6d
 pkgrel=1
 pkgdesc="FPGA Assembly (FASM) Parser and Generation library"
-arch=(any)
+arch=(x86_64)
 url="https://github.com/SymbiFlow/fasm"
 license=('ISC')
-depends=('python' 'python-textx')
-makedepends=('git' 'python-setuptools')
+depends=('python' 'python-textx' 'antlr4-runtime')
+makedepends=('git' 'python-setuptools' 'cython' 'cmake' 'antlr4')
 checkdepends=('python-pytest')
 provides=("${pkgname%%-git}=$pkgver")
 conflicts=(fasm "${pkgname%%-git}")
-source=("git+$url.git")
-sha256sums=('SKIP')
+source=("git+$url.git"
+        "git+https://github.com/antlr/antlr4"
+        "git+https://github.com/google/googletest")
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
 
 pkgver() {
 	cd "$_pkgname"
@@ -22,16 +26,25 @@ pkgver() {
 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
+prepare() {
 	cd "$_pkgname"
 
-	python setup.py build
+	git submodule init
+	git config submodule.third_party/antlr4.url "$srcdir/antlr4"
+	git config submodule.third_party/googletest.url "$srcdir/googletest"
+	git submodule update
 }
 
-check() {
+build() {
 	cd "$_pkgname"
 
-	PYTHONPATH=. pytest
+	python setup.py build --antlr-runtime=shared
+}
+
+check() {
+	: broken
+	#local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
+	#PYTHONPATH="$srcdir/$_pkgname/build/lib.linux-$CARCH-$python_version" pytest "$_pkgname/tests"
 }
 
 package() {