Fixes to make it pip-installable

MANIFEST.in

@@ -1,11 +1,12 @@
-include run.py
-include *.rst
-include LICENSE*
-recursive-include docs *.rst
-recursive-include omnivore/icons *.png *.ico *.icns
-recursive-include test_data air_defense_v18.xex
-recursive-include tests *.sh *.py
-recursive-include omnivore *.c
-include traits/*.h
-prune atrcopy  # force using atrcopy from pypi rather than local dev copy
-exclude udis/udis.py  # python 3 file that causes syntax error
+include run.py
+include *.rst
+include LICENSE*
+recursive-include docs *.rst
+recursive-include omnivore/icons *.png *.ico *.icns
+recursive-include test_data air_defense_v18.xex
+recursive-include tests *.sh *.py
+recursive-include omnivore *.c
+include traits/*.h
+prune atrcopy  # force using atrcopy from pypi rather than local dev copy
+recursive-include udis *.c
+exclude udis/udis.py  # python 3 file that causes syntax error

omnivore/_omnivore_version.py

@@ -1 +1 @@
-version = "0.15.0"
+version = "0.15.1"

omnivore8bit/arch/disasm.py

@@ -2,7 +2,6 @@
 
 from udis import miniasm, cputables
 import udis.udis_fast as udis_fast
-from udis.udis_fast.disasm_info import DisassemblyInfo, fast_disassemble_segment
 
 from atrcopy import match_bit_mask, comment_bit_mask, selected_bit_mask, user_bit_mask, data_style
 
@@ -168,7 +167,7 @@ def disassemble_segment(self, segment):
         self.segment = segment
         self.start_addr = segment.start_addr
         self.end_addr = self.start_addr + len(segment)
-        self.info = fast_disassemble_segment(self.fast, segment)
+        self.info = udis_fast.fast_disassemble_segment(self.fast, segment)
         self.use_labels = self.start_addr > 0
         return self.info
 

omnivore8bit/file_type/atari800_savestate.py

@@ -7,8 +7,10 @@
 from omnivore.file_type.i_file_recognizer import IFileRecognizer
 from omnivore8bit.document import SegmentedDocument
 
-from pyatari800 import parse_atari800
-
+try:
+   from pyatari800 import parse_atari800
+except ImportError:
+   pass
 
 @provides(IFileRecognizer)
 class Atari800Recognizer(HasTraits):

setup.py

@@ -18,6 +18,11 @@
 from setuptools import setup
 from distutils.extension import Extension
 
+if sys.platform.startswith("win"):
+    udis_compile_args = ["-DMSVC", "-D_CRT_SECURE_NO_WARNINGS"]
+else:
+    udis_compile_args = []
+
 ext_modules = [
     Extension("traits.ctraits",
               sources = ["traits/ctraits.c"],
@@ -26,7 +31,18 @@
     Extension("omnivore8bit.arch.antic_speedups",
               sources=["omnivore8bit/arch/antic_speedups.c"],
               extra_compile_args = ["-O3" ],
-              )
+              ),
+    Extension("udis.udis_fast.disasm_info",
+              sources = ["udis/udis_fast/disasm_info.c"],
+              extra_compile_args = udis_compile_args,
+              ),
+    Extension("udis.udis_fast.disasm_speedups_monolithic",
+              sources = [
+                  "udis/udis_fast/disasm_speedups_monolithic.c",
+                  "udis/udis_fast/hardcoded_parse_monolithic.c",
+                  ],
+              extra_compile_args = udis_compile_args,
+              ),
     ]
 
 install_requires = [
@@ -37,6 +53,7 @@
     'bson<1.0.0',
     'configobj',
     'pyparsing',
+    'wxpython',
     ]
 
 
@@ -62,7 +79,11 @@ class sdist(_sdist):
         def run(self):
             # Make sure the compiled Cython files in the distribution are up-to-date
             from Cython.Build import cythonize
-            cythonize(["omnivore8bit/arch/antic_speedups.pyx"])
+            cythonize([
+                "omnivore8bit/arch/antic_speedups.pyx",
+                "udis/udis_fast/disasm_info.pyx",
+                "udis/udis_fast/disasm_speedups_monolithic.pyx",
+                ])
             _sdist.run(self)
     cmdclass["sdist"] = sdist