Try moving generated files into fasm/parser/lib

Signed-off-by: Dusty DeWeese <[email protected]>
chipsalliance · Dec 10, 2020 · 61f03bc · 61f03bc
1 parent 77e7170
commit 61f03bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/fasm/parser/antlr.py b/fasm/parser/antlr.py
@@ -14,7 +14,7 @@
 from sys import byteorder
 from fasm.model import \
     SetFasmFeature, Annotation, FasmLine, ValueFormat
-from fasm.parser import tags
+from fasm.parser.lib import tags
 import platform
 from pathlib import Path
 
@@ -30,7 +30,7 @@
         parse_fasm_lib = "libparse_fasm.so"
 
     here = Path(os.path.dirname(os.path.realpath(__file__)))
-    parse_fasm = CDLL(str(here / parse_fasm_lib))
+    parse_fasm = CDLL(str(here / 'lib' / parse_fasm_lib))
     parse_fasm.from_string.restype = POINTER(c_char)
     parse_fasm.from_file.restype = POINTER(c_char)
 except OSError:

diff --git a/setup.py b/setup.py
@@ -108,7 +108,8 @@ def build_extension(self, ext):
         'console_scripts': ['fasm=fasm:main'],
     },
     ext_modules=[
-        CMakeExtension('parse_fasm', sourcedir='src', prefix='fasm/parser')
+        CMakeExtension(
+            'parse_fasm', sourcedir='src', prefix='fasm/parser/lib')
     ],
     cmdclass={
         'build_ext': CMakeBuild,