Commit b131b7cd by devttys0

Removed depreciated build code related to pyqtgraph

parent 1541bf26
...@@ -10,7 +10,6 @@ export INSTALL_OPTIONS=@INSTALL_OPTIONS@ ...@@ -10,7 +10,6 @@ export INSTALL_OPTIONS=@INSTALL_OPTIONS@
export PLATFORM=@PLATFORM@ export PLATFORM=@PLATFORM@
export BUILD_MAGIC=@BUILD_MAGIC@ export BUILD_MAGIC=@BUILD_MAGIC@
export BUILD_FUZZY=@BUILD_FUZZY@ export BUILD_FUZZY=@BUILD_FUZZY@
export BUILD_PYQTGRAPH=@BUILD_PYQTGRAPH@
export PYLIBDIR="./binwalk/libs" export PYLIBDIR="./binwalk/libs"
BUILD_C_LIBS=@BUILD_C_LIBS@ BUILD_C_LIBS=@BUILD_C_LIBS@
......
...@@ -144,14 +144,6 @@ install_data_files = [os.path.join("libs", "*.so"), os.path.join("libs", "*.dyli ...@@ -144,14 +144,6 @@ install_data_files = [os.path.join("libs", "*.so"), os.path.join("libs", "*.dyli
for data_dir in data_dirs: for data_dir in data_dirs:
install_data_files.append("%s%s*" % (data_dir, os.path.sep)) install_data_files.append("%s%s*" % (data_dir, os.path.sep))
if os.getenv("BUILD_PYQTGRAPH") == "yes":
install_data_files.append(os.path.join("libs", "pyqtgraph", "*.py"))
for (root, dirs, files) in os.walk(os.path.join(MODULE_NAME, "libs", "pyqtgraph")):
if dirs:
for directory in dirs:
install_data_files.append(os.path.join(os.path.sep.join(root.split(os.path.sep)[1:]), os.path.join(directory, "*.py")))
# Install the module, script, and support files # Install the module, script, and support files
setup(name = MODULE_NAME, setup(name = MODULE_NAME,
version = "2.1.0", version = "2.1.0",
......
...@@ -3,11 +3,6 @@ __all__ = ['scan', 'execute', 'Modules', 'ModuleException'] ...@@ -3,11 +3,6 @@ __all__ = ['scan', 'execute', 'Modules', 'ModuleException']
import sys import sys
import binwalk.core.common import binwalk.core.common
# This allows importing of the built-in pyqtgraph if it
# is not available on the system at run time.
# No longer needed, as pyqtgraph is no longer bundled with binwalk.
sys.path.append(binwalk.core.common.get_libs_path())
from binwalk.core.module import Modules, ModuleException from binwalk.core.module import Modules, ModuleException
# Convenience functions # Convenience functions
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment