From 4ab5050db593ee393208390ee5eabbd5f79e220b Mon Sep 17 00:00:00 2001
From: devttys0 <heffnercj@gmail.com>
Date: Mon, 23 Dec 2013 00:03:28 -0500
Subject: [PATCH] Updated install files
---
INSTALL | 9 +++++++++
Makefile.in | 4 ++--
setup.py | 2 +-
src/C/Makefile.in | 7 ++++++-
src/C/compress/Makefile | 3 +++
src/C/compress/test.py | 20 --------------------
src/C/miniz/Makefile | 3 +++
src/C/miniz/test.py | 21 ---------------------
8 files changed, 24 insertions(+), 45 deletions(-)
delete mode 100755 src/C/compress/test.py
delete mode 100755 src/C/miniz/test.py
diff --git a/INSTALL b/INSTALL
index 66e2472..a9a11fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -66,3 +66,12 @@ and placed in the /opt/firmware-mod-kit directory:
$ git clone https://code.google.com/p/firmware-mod-kit /opt/firmware-mod-kit/
$ cd /opt/firmware-mod-kit/src && ./configure && make
+
+
+UNINSTALL
+----------------------------------
+
+The following command will remove all installed libraries and modules (except for the extraction/optional dependencies):
+
+ $ sudo make uninstall
+
diff --git a/Makefile.in b/Makefile.in
index 0044878..fcbd8b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,10 +3,10 @@ SRC_C_DIR="./src/C"
.PHONY: all install build dependencies clean uninstall
-all: install
+all: build
install: build
- make -c $(SRC_C_DIR) install
+ make -C $(SRC_C_DIR) install
$(PYTHON) ./setup.py install
build:
diff --git a/setup.py b/setup.py
index 2826f8e..3c77d24 100755
--- a/setup.py
+++ b/setup.py
@@ -122,7 +122,7 @@ if "install" in sys.argv:
print("checking pre-requisites")
try:
import pyqtgraph
- import QtPyWhatever
+ from pyqtgraph.Qt import QtCore, QtGui, QtOpenGL
except ImportError as e:
msg = ["Pre-requisite check warning: " + str(e),
"To take advantage of this %s's graphing capabilities, please install this module." % MODULE_NAME,
diff --git a/src/C/Makefile.in b/src/C/Makefile.in
index 4acdc5a..8a3515f 100644
--- a/src/C/Makefile.in
+++ b/src/C/Makefile.in
@@ -7,7 +7,7 @@ export exec_prefix=@exec_prefix@
export LIBDIR=@libdir@
export INSTALL_OPTIONS=@INSTALL_OPTIONS@
-.PHONY: all install clean distclean
+.PHONY: all install clean distclean uninstall
all:
make -C miniz
@@ -29,3 +29,8 @@ distclean:
make -C compress distclean
make -C fuzzy distclean
rm -rf *.cache config.* Makefile
+
+uninstall:
+ make -C miniz uninstall
+ make -C compress uninstall
+ make -C fuzzy uninstall
diff --git a/src/C/compress/Makefile b/src/C/compress/Makefile
index 480e2fe..5a20c9f 100644
--- a/src/C/compress/Makefile
+++ b/src/C/compress/Makefile
@@ -11,6 +11,9 @@ compress42.o:
install:
install $(INSTALL_OPTIONS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+uninstall:
+ rm -rf $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+
.PHONY: clean distclean
clean:
diff --git a/src/C/compress/test.py b/src/C/compress/test.py
deleted file mode 100755
index 0970665..0000000
--- a/src/C/compress/test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import ctypes
-import ctypes.util
-
-SIZE = 64
-
-try:
- data = open(sys.argv[1], "rb").read(SIZE)
-except:
- print "Usage: %s <input file>" % sys.argv[0]
- sys.exit(1)
-
-comp = ctypes.cdll.LoadLibrary(ctypes.util.find_library("compress42"))
-
-if comp.is_compressed(data, len(data)):
- print "%s is compress'd." % (sys.argv[1])
-else:
- print "%s is not compress'd." % sys.argv[1]
diff --git a/src/C/miniz/Makefile b/src/C/miniz/Makefile
index 6f49fb8..8b08b3d 100644
--- a/src/C/miniz/Makefile
+++ b/src/C/miniz/Makefile
@@ -11,6 +11,9 @@ tinfl.o:
install:
install $(INSTALL_OPTIONS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+uninstall:
+ rm -rf $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+
.PHONY: clean distclean
clean:
diff --git a/src/C/miniz/test.py b/src/C/miniz/test.py
deleted file mode 100755
index a5b9071..0000000
--- a/src/C/miniz/test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import ctypes
-import ctypes.util
-
-SIZE = 33*1024
-
-try:
- data = open(sys.argv[1], "rb").read(SIZE)
-except:
- print "Usage: %s <input file>" % sys.argv[0]
- sys.exit(1)
-
-tinfl = ctypes.cdll.LoadLibrary(ctypes.util.find_library("tinfl"))
-
-if tinfl.is_deflated(data, len(data), 0):
- print "%s is deflated." % (sys.argv[1])
- print "Inflated to %d bytes!" % tinfl.inflate_raw_file(sys.argv[1], sys.argv[1] + '.inflated')
-else:
- print "%s is not deflated." % sys.argv[1]
--
libgit2 0.26.0