Added setup.py, converted engine to a module

15 files changed, 25 insertions, 1 deletions

diff --git a/MAFH2/MafhActivity.py b/MAFH2/MafhActivity.py
index 752c21a..e32b464 100755
--- a/MAFH2/MafhActivity.py
+++ b/MAFH2/MafhActivity.py
@@ -1,5 +1,15 @@
 #!/usr/bin/env python
-from fortuneengine.GameEngine import GameEngine
+
+try:
+    from fortuneengine.GameEngine import GameEngine
+except:
+    # Target system is an xo, so we may not have the module
+    # installed, so we want to load the one in our folder
+    print "Using forutune engine from path"
+    import sys
+    sys.path.append( 'fortuneengine' )
+    from fortuneengine.GameEngine import GameEngine
+
 from MafhGameMenu import GameMenuHolder
 from constants import MENU_PATH, FMC_PATH, TOUR_PATH
 
diff --git a/MAFH2/fortuneengine/DrawableFontObject.py b/MAFH2/fortuneengine/fortuneengine/DrawableFontObject.py
index 92f641f..92f641f 100644
--- a/MAFH2/fortuneengine/DrawableFontObject.py
+++ b/MAFH2/fortuneengine/fortuneengine/DrawableFontObject.py
diff --git a/MAFH2/fortuneengine/DrawableObject.py b/MAFH2/fortuneengine/fortuneengine/DrawableObject.py
index 96bb8ef..96bb8ef 100644
--- a/MAFH2/fortuneengine/DrawableObject.py
+++ b/MAFH2/fortuneengine/fortuneengine/DrawableObject.py
diff --git a/MAFH2/fortuneengine/DynamicDrawableObject.py b/MAFH2/fortuneengine/fortuneengine/DynamicDrawableObject.py
index 7dcb831d..7dcb831d 100644
--- a/MAFH2/fortuneengine/DynamicDrawableObject.py
+++ b/MAFH2/fortuneengine/fortuneengine/DynamicDrawableObject.py
diff --git a/MAFH2/fortuneengine/GameEngine.py b/MAFH2/fortuneengine/fortuneengine/GameEngine.py
index 48d7d3e..48d7d3e 100644
--- a/MAFH2/fortuneengine/GameEngine.py
+++ b/MAFH2/fortuneengine/fortuneengine/GameEngine.py
diff --git a/MAFH2/fortuneengine/GameEngineConsole.py b/MAFH2/fortuneengine/fortuneengine/GameEngineConsole.py
index 0f5efdc..0f5efdc 100644
--- a/MAFH2/fortuneengine/GameEngineConsole.py
+++ b/MAFH2/fortuneengine/fortuneengine/GameEngineConsole.py
diff --git a/MAFH2/fortuneengine/GameEngineElement.py b/MAFH2/fortuneengine/fortuneengine/GameEngineElement.py
index 3f51f2f..3f51f2f 100644
--- a/MAFH2/fortuneengine/GameEngineElement.py
+++ b/MAFH2/fortuneengine/fortuneengine/GameEngineElement.py
diff --git a/MAFH2/fortuneengine/GameInspect.py b/MAFH2/fortuneengine/fortuneengine/GameInspect.py
index ea69540..ea69540 100644
--- a/MAFH2/fortuneengine/GameInspect.py
+++ b/MAFH2/fortuneengine/fortuneengine/GameInspect.py
diff --git a/MAFH2/fortuneengine/Scene.py b/MAFH2/fortuneengine/fortuneengine/Scene.py
index d2e50a9..d2e50a9 100644
--- a/MAFH2/fortuneengine/Scene.py
+++ b/MAFH2/fortuneengine/fortuneengine/Scene.py
diff --git a/MAFH2/fortuneengine/__init__.py b/MAFH2/fortuneengine/fortuneengine/__init__.py
index 211298b..211298b 100644
--- a/MAFH2/fortuneengine/__init__.py
+++ b/MAFH2/fortuneengine/fortuneengine/__init__.py
diff --git a/MAFH2/fortuneengine/pyconsole/__init__.py b/MAFH2/fortuneengine/fortuneengine/pyconsole/__init__.py
index e69de29..e69de29 100644
--- a/MAFH2/fortuneengine/pyconsole/__init__.py
+++ b/MAFH2/fortuneengine/fortuneengine/pyconsole/__init__.py
diff --git a/MAFH2/fortuneengine/pyconsole/fonts/default.ttf b/MAFH2/fortuneengine/fortuneengine/pyconsole/fonts/default.ttf
index 139f0b4..139f0b4 100755
--- a/MAFH2/fortuneengine/pyconsole/fonts/default.ttf
+++ b/MAFH2/fortuneengine/fortuneengine/pyconsole/fonts/default.ttf
diff --git a/MAFH2/fortuneengine/pyconsole/pyconsole.cfg b/MAFH2/fortuneengine/fortuneengine/pyconsole/pyconsole.cfg
index a1f8c0f..a1f8c0f 100644
--- a/MAFH2/fortuneengine/pyconsole/pyconsole.cfg
+++ b/MAFH2/fortuneengine/fortuneengine/pyconsole/pyconsole.cfg
diff --git a/MAFH2/fortuneengine/pyconsole/pyconsole.py b/MAFH2/fortuneengine/fortuneengine/pyconsole/pyconsole.py
index 7bb68e4..7bb68e4 100644
--- a/MAFH2/fortuneengine/pyconsole/pyconsole.py
+++ b/MAFH2/fortuneengine/fortuneengine/pyconsole/pyconsole.py
diff --git a/MAFH2/fortuneengine/setup.py b/MAFH2/fortuneengine/setup.py
new file mode 100644
index 0000000..9e512e7
--- /dev/null
+++ b/MAFH2/fortuneengine/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(name='Fortune Engine',
+      version='1.0',
+      description='The Fortune Game Engine',
+      author='Justin Lewis',
+      author_email='jlew.blackout@gmail.com',
+      url='https://fedorahosted.org/fortune_hunter/wiki/FortuneEngine',
+      packages=['fortuneengine','fortuneengine.pyconsole'],
+      package_data={'fortuneengine.pyconsole': ['*.cfg','fonts/*.ttf']},
+      license="GPL 3",
+     )