From af3d23e3ffda29fffe5bf88e4fa40914bf672ad6 Mon Sep 17 00:00:00 2001 From: Ionel-Cristinel ANICHITEI Date: Wed, 20 Oct 2021 09:32:50 +0300 Subject: [PATCH] Move pybddisasm to the bindings directory --- .github/workflows/ci.yml | 2 +- .gitignore | 4 +--- {pybddisasm => bindings/pybddisasm}/LICENSE | 0 {pybddisasm => bindings/pybddisasm}/MANIFEST.in | 0 {pybddisasm => bindings/pybddisasm}/README.md | 0 .../pybddisasm}/_pybddisasm/_pybddisasm.c | 1 + .../pybddisasm}/_pybddisasm/pybddisasm.c | 0 .../pybddisasm}/_pybddisasm/pybddisasm.h | 0 {pybddisasm => bindings/pybddisasm}/pybddisasm/__init__.py | 0 {pybddisasm => bindings/pybddisasm}/pybddisasm/__main__.py | 0 {pybddisasm => bindings/pybddisasm}/pybddisasm/app.py | 0 {pybddisasm => bindings/pybddisasm}/pybddisasm/bddisasm.py | 0 {pybddisasm => bindings/pybddisasm}/pybddisasm/core.py | 0 {pybddisasm => bindings/pybddisasm}/pybddisasm/helpers.py | 0 {pybddisasm => bindings/pybddisasm}/setup.cfg | 0 {pybddisasm => bindings/pybddisasm}/setup.py | 6 +++--- 16 files changed, 6 insertions(+), 7 deletions(-) rename {pybddisasm => bindings/pybddisasm}/LICENSE (100%) rename {pybddisasm => bindings/pybddisasm}/MANIFEST.in (100%) rename {pybddisasm => bindings/pybddisasm}/README.md (100%) rename {pybddisasm => bindings/pybddisasm}/_pybddisasm/_pybddisasm.c (99%) rename {pybddisasm => bindings/pybddisasm}/_pybddisasm/pybddisasm.c (100%) rename {pybddisasm => bindings/pybddisasm}/_pybddisasm/pybddisasm.h (100%) rename {pybddisasm => bindings/pybddisasm}/pybddisasm/__init__.py (100%) rename {pybddisasm => bindings/pybddisasm}/pybddisasm/__main__.py (100%) rename {pybddisasm => bindings/pybddisasm}/pybddisasm/app.py (100%) rename {pybddisasm => bindings/pybddisasm}/pybddisasm/bddisasm.py (100%) rename {pybddisasm => bindings/pybddisasm}/pybddisasm/core.py (100%) rename {pybddisasm => bindings/pybddisasm}/pybddisasm/helpers.py (100%) rename {pybddisasm => bindings/pybddisasm}/setup.cfg (100%) rename {pybddisasm => bindings/pybddisasm}/setup.py (94%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1fa6e8..9cfaf09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: python3 -m pip install setuptools - name: Build pybddisasm run: | - cd pybddisasm + cd bindings/pybddisasm python3 setup.py build cd - - name: Create package diff --git a/.gitignore b/.gitignore index d581f7d..68c2033 100644 --- a/.gitignore +++ b/.gitignore @@ -47,9 +47,6 @@ _UpgradeReport_Files/* *.pyc .*.swp *.pyd -pydis/pydis.egg-info/ -pydis/build/ -pydis/dist/ .vs/ disasmtool_lix/build @@ -69,3 +66,4 @@ build/ disasmtool_lix/_build rsbddisasm/target rsbddisasm/Cargo.lock +bindings/pybddisasm/pybddisasm.egg-info diff --git a/pybddisasm/LICENSE b/bindings/pybddisasm/LICENSE similarity index 100% rename from pybddisasm/LICENSE rename to bindings/pybddisasm/LICENSE diff --git a/pybddisasm/MANIFEST.in b/bindings/pybddisasm/MANIFEST.in similarity index 100% rename from pybddisasm/MANIFEST.in rename to bindings/pybddisasm/MANIFEST.in diff --git a/pybddisasm/README.md b/bindings/pybddisasm/README.md similarity index 100% rename from pybddisasm/README.md rename to bindings/pybddisasm/README.md diff --git a/pybddisasm/_pybddisasm/_pybddisasm.c b/bindings/pybddisasm/_pybddisasm/_pybddisasm.c similarity index 99% rename from pybddisasm/_pybddisasm/_pybddisasm.c rename to bindings/pybddisasm/_pybddisasm/_pybddisasm.c index 0a4f9ed..63292c6 100644 --- a/pybddisasm/_pybddisasm/_pybddisasm.c +++ b/bindings/pybddisasm/_pybddisasm/_pybddisasm.c @@ -96,6 +96,7 @@ static char *TupleTypeToString(ND_TUPLE TupleType) case ND_TUPLE_None: return "None"; case ND_TUPLE_FV: return "FV"; case ND_TUPLE_HV: return "HV"; + case ND_TUPLE_QV: return "QV"; case ND_TUPLE_T1S8: return "T1S8"; case ND_TUPLE_T1S16: return "T1S16"; case ND_TUPLE_T1S: return "T1S"; diff --git a/pybddisasm/_pybddisasm/pybddisasm.c b/bindings/pybddisasm/_pybddisasm/pybddisasm.c similarity index 100% rename from pybddisasm/_pybddisasm/pybddisasm.c rename to bindings/pybddisasm/_pybddisasm/pybddisasm.c diff --git a/pybddisasm/_pybddisasm/pybddisasm.h b/bindings/pybddisasm/_pybddisasm/pybddisasm.h similarity index 100% rename from pybddisasm/_pybddisasm/pybddisasm.h rename to bindings/pybddisasm/_pybddisasm/pybddisasm.h diff --git a/pybddisasm/pybddisasm/__init__.py b/bindings/pybddisasm/pybddisasm/__init__.py similarity index 100% rename from pybddisasm/pybddisasm/__init__.py rename to bindings/pybddisasm/pybddisasm/__init__.py diff --git a/pybddisasm/pybddisasm/__main__.py b/bindings/pybddisasm/pybddisasm/__main__.py similarity index 100% rename from pybddisasm/pybddisasm/__main__.py rename to bindings/pybddisasm/pybddisasm/__main__.py diff --git a/pybddisasm/pybddisasm/app.py b/bindings/pybddisasm/pybddisasm/app.py similarity index 100% rename from pybddisasm/pybddisasm/app.py rename to bindings/pybddisasm/pybddisasm/app.py diff --git a/pybddisasm/pybddisasm/bddisasm.py b/bindings/pybddisasm/pybddisasm/bddisasm.py similarity index 100% rename from pybddisasm/pybddisasm/bddisasm.py rename to bindings/pybddisasm/pybddisasm/bddisasm.py diff --git a/pybddisasm/pybddisasm/core.py b/bindings/pybddisasm/pybddisasm/core.py similarity index 100% rename from pybddisasm/pybddisasm/core.py rename to bindings/pybddisasm/pybddisasm/core.py diff --git a/pybddisasm/pybddisasm/helpers.py b/bindings/pybddisasm/pybddisasm/helpers.py similarity index 100% rename from pybddisasm/pybddisasm/helpers.py rename to bindings/pybddisasm/pybddisasm/helpers.py diff --git a/pybddisasm/setup.cfg b/bindings/pybddisasm/setup.cfg similarity index 100% rename from pybddisasm/setup.cfg rename to bindings/pybddisasm/setup.cfg diff --git a/pybddisasm/setup.py b/bindings/pybddisasm/setup.py similarity index 94% rename from pybddisasm/setup.py rename to bindings/pybddisasm/setup.py index e2847de..7125bb4 100644 --- a/pybddisasm/setup.py +++ b/bindings/pybddisasm/setup.py @@ -20,7 +20,7 @@ requires = ['setuptools'] here = os.path.abspath(os.path.dirname(__file__)) def _check_library_version(): - version_header = '../inc/version.h' + version_header = '../../inc/version.h' with open(version_header, 'r') as file: data = file.read() @@ -92,8 +92,8 @@ setup( extra_compile_args = ["-march=westmere"], sources = ["_pybddisasm/_pybddisasm.c", "_pybddisasm/pybddisasm.c"], define_macros = [('AMD64', None), ('LIBRARY_INSTRUX_SIZE', LIBRARY_INSTRUX_SIZE)], - include_dirs = ['../inc'], + include_dirs = ['../../inc'], libraries = ['bddisasm'], - library_dirs = ['/usr/local/lib', '../bin/x64/Release'])], + library_dirs = ['/usr/local/lib', '../../build', '../../bin/x64/Release'])], distclass=BinaryDistribution )