MANIFEST tweaks + arranging examples to find elftools even if it's not installed

diff --git a/.hgignore b/.hgignore
index ba42721965a39db5228cd077d942735652432f67..5ada10a50e1c4b2511755abc8bbba0d57955e22a 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -4,4 +4,8 @@ syntax: glob
 .coverage
 htmlcov
 tags
+build
+dist
+MANIFEST
+
 

diff --git a/MANIFEST.in b/MANIFEST.in
index 94747767a96eb28dc88cd75a5e1bdcf91005b220..e09a955ca18929e7b8ec325fba547f337061e692 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 recursive-include elftools *.py \r
 recursive-include scripts *.py\r
 recursive-include examples *.py *.elf\r
-prune test\r
+recursive-include test *.py *.elf\r
 include README\r
 include LICENSE\r
 include CHANGES\r

diff --git a/examples/dwarf_die_tree.py b/examples/dwarf_die_tree.py
index 5633d594f42e58755ab1607650843f9488342590..769adcf8e715a975b387057efbf004569dfeb9c6 100644 (file)
--- a/examples/dwarf_die_tree.py
+++ b/examples/dwarf_die_tree.py
@@ -9,6 +9,14 @@
 #-------------------------------------------------------------------------------
 from __future__ import print_function
 import sys
+
+# If elftools is not installed, maybe we're running from the root or examples
+# dir of the source distribution
+try:
+    import elftools
+except ImportError:
+    sys.path.extend(['.', '..'])
+
 from elftools.elf.elffile import ELFFile
 
 

diff --git a/examples/elf_low_high_api.py b/examples/elf_low_high_api.py
index 43f98802d7862b636656267d3dd06722c5cabd26..97e4dc40a4fc473100076bbec5bf1b939da3b406 100644 (file)
--- a/examples/elf_low_high_api.py
+++ b/examples/elf_low_high_api.py
@@ -9,6 +9,14 @@
 #-------------------------------------------------------------------------------
 from __future__ import print_function
 import sys
+
+# If elftools is not installed, maybe we're running from the root or examples
+# dir of the source distribution
+try:
+    import elftools
+except ImportError:
+    sys.path.extend(['.', '..'])
+
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection
 

diff --git a/examples/elf_relocations.py b/examples/elf_relocations.py
index a09f014706c297d013fda07ad6da01e4f4c4aa61..e142e188134964da7a5ed5d610058f7e186f5b71 100644 (file)
--- a/examples/elf_relocations.py
+++ b/examples/elf_relocations.py
@@ -9,6 +9,14 @@
 #-------------------------------------------------------------------------------
 from __future__ import print_function
 import sys
+
+# If elftools is not installed, maybe we're running from the root or examples
+# dir of the source distribution
+try:
+    import elftools
+except ImportError:
+    sys.path.extend(['.', '..'])
+
 from elftools.elf.elffile import ELFFile
 from elftools.elf.relocation import RelocationSection
 

diff --git a/examples/elfclass_address_size.py b/examples/elfclass_address_size.py
index 21c839cea80467650d231a4f2bff2a0e991a8f9d..39c1fbcf6ef0eeeeeb161821b673f8a1f4874021 100644 (file)
--- a/examples/elfclass_address_size.py
+++ b/examples/elfclass_address_size.py
@@ -9,6 +9,14 @@
 #-------------------------------------------------------------------------------
 from __future__ import print_function
 import sys
+
+# If elftools is not installed, maybe we're running from the root or examples
+# dir of the source distribution
+try:
+    import elftools
+except ImportError:
+    sys.path.extend(['.', '..'])
+
 from elftools.elf.elffile import ELFFile
 
 

diff --git a/examples/examine_dwarf_info.py b/examples/examine_dwarf_info.py
index 7a2c0344ebeb144e171378e84948bc99444759bb..606441233f368837c97fd43ac375a0131bd37191 100644 (file)
--- a/examples/examine_dwarf_info.py
+++ b/examples/examine_dwarf_info.py
@@ -8,6 +8,14 @@
 #-------------------------------------------------------------------------------
 from __future__ import print_function
 import sys
+
+# If elftools is not installed, maybe we're running from the root or examples
+# dir of the source distribution
+try:
+    import elftools
+except ImportError:
+    sys.path.extend(['.', '..'])
+
 from elftools.elf.elffile import ELFFile
 
 

diff --git a/scripts/readelf.py b/scripts/readelf.py
index c133d5324ddc7e324e14b17c68acf9f9ab945c8c..6ecac7bd8a68f4db92cf5ac976ceeced8f70eda5 100755 (executable)
--- a/scripts/readelf.py
+++ b/scripts/readelf.py
@@ -12,10 +12,8 @@ from optparse import OptionParser
 from itertools import ifilter
 import string
 
-
 # If elftools is not installed, maybe we're running from the root or scripts
 # dir of the source distribution
-#
 try:
     import elftools
 except ImportError: