Merge pull request #1337 from antmicro/add-setup-package

Adds installation of Xray tools

Makefile

@@ -1,6 +1,8 @@
 SHELL = bash
 ALL_EXCLUDE = third_party .git env build docs/env
 
+INSTALL_DIR ?=
+
 # Check if root
 ifeq ($(shell id -u),0)
         $(error ERROR: Running as ID 0)
@@ -35,6 +37,9 @@ build:
 	mkdir -p build
 	cd build; cmake ..; $(MAKE)
 
+install:
+	cd build; $(MAKE) DESTDIR=${INSTALL_DIR} install
+
 .PHONY: env build
 
 # Run tests of code.

setup.py

@@ -12,7 +12,7 @@ setuptools.setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/SymbiFlow/prjxray",
-    packages=setuptools.find_packages(),
+    packages=['prjxray', 'utils'],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: ISC License",

tools/CMakeLists.txt

@@ -33,3 +33,5 @@ target_link_libraries(xc7frames2bit
 	gflags
 	libprjxray
 )
+
+install(TARGETS xc7frames2bit xc7patch gen_part_base_yaml frame_address_decoder bittool segmatch bitread DESTINATION bin)

utils/checkdb.py

@@ -12,7 +12,7 @@ Relies on 074, which is too far into the process
 from prjxray import util
 from prjxray import db as prjxraydb
 import os
-import parsedb
+import utils.parsedb as parsedb
 #from prjxray import db as prjxraydb
 import glob
 

utils/sort_db.py

@@ -54,8 +54,8 @@ import re
 import sys
 
 import json
-import xjson
+import utils.xjson as xjson
-import cmp
+import utils.cmp as cmp
 
 
 def split_all(s, chars):

utils/test_fasm2frames.py

@@ -9,7 +9,7 @@ import unittest
 import tempfile
 
 import prjxray
-import fasm2frames
+import utils.fasm2frames as fasm2frames
 
 from textx.exceptions import TextXSyntaxError