Merge pull request #1368 from SymbiFlow/revert-1347-add-setup-package

Revert "Move fasm2frames to prjxray"

minitests/roi_harness/runme.sh

@@ -68,7 +68,7 @@ test -z "$(fgrep CRITICAL vivado.log)"
 
 ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit
 python3 ${XRAY_DIR}/utils/bit2fasm.py --verbose design.bit > design.fasm
-python3 ${XRAY_DIR}/prjxray/fasm2frames.py design.fasm design.frm
+python3 ${XRAY_DIR}/utils/fasm2frames.py design.fasm design.frm
 PYTHONPATH=$PYTHONPATH:$XRAY_DIR/utils python3 ../create_design_json.py \
     --design_info_txt design_info.txt \
     --design_txt design.txt \

setup.py

@@ -30,5 +30,5 @@ setuptools.setup(
         "Operating System :: OS Independent",
     ],
     entry_points={
-        'console_scripts': ['fasm2frames=prjxray.fasm2frames:main'],
+        'console_scripts': ['fasm2frames=utils.fasm2frames:main'],
     })

utils/environment.sh

@@ -15,7 +15,6 @@ done
 export XRAY_UTILS_DIR="$( cd -P "$( dirname "$XRAY_ENV_PATH" )" && pwd )"
 export XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )"
 export XRAY_DATABASE_DIR="${XRAY_DIR}/database"
-export XRAY_PRJXRAY_DIR="${XRAY_DIR}/prjxray"
 export XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools"
 export XRAY_FUZZERS_DIR="${XRAY_DIR}/fuzzers"
 export XRAY_FAMILY_DIR="${XRAY_DATABASE_DIR}/${XRAY_DATABASE}"
@@ -37,7 +36,7 @@ export XRAY_MASKMERGE="bash ${XRAY_UTILS_DIR}/maskmerge.sh"
 export XRAY_SEGMATCH="${XRAY_TOOLS_DIR}/segmatch"
 export XRAY_SEGPRINT="python3 ${XRAY_UTILS_DIR}/segprint.py"
 export XRAY_BIT2FASM="python3 ${XRAY_UTILS_DIR}/bit2fasm.py"
-export XRAY_FASM2FRAMES="python3 ${XRAY_PRJXRAY_DIR}/fasm2frames.py"
+export XRAY_FASM2FRAMES="python3 ${XRAY_UTILS_DIR}/fasm2frames.py"
 export XRAY_BITTOOL="${XRAY_TOOLS_DIR}/bittool"
 export XRAY_BLOCKWIDTH="python3 ${XRAY_UTILS_DIR}/blockwidth.py"
 export XRAY_PARSEDB="python3 ${XRAY_UTILS_DIR}/parsedb.py"

utils/fasm2frames.py

@@ -20,9 +20,9 @@ import csv
 
 from collections import defaultdict
 
-from . import fasm_assembler, util
+from prjxray import fasm_assembler, util
-from .db import Database
+from prjxray.db import Database
-from .roi import Roi
+from prjxray.roi import Roi
 
 import sys
 

utils/test_fasm2frames.py

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