setup all

diff --git a/.gitignore b/.gitignore
index 6d0fb25..e517bae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ resource/local/
 *.pyc
 dist/
 MANIFEST
+Wind_off_of_Heaven_s_Lake.egg-info

diff --git a/MANIFEST.in b/MANIFEST.in
index c8a1bb8..86b04f5 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,7 @@
-include config
+include config OPEN-GAME 
 recursive-include resource *
+recursive-include lake_of_heavenly_wind *
+recursive-include lib *
+prune lib/pgfw/.git
 prune resource/local
+global-exclude *.pyc .git* 

diff --git a/config b/config
index a2a8dee..2fa6521 100644 (file)
--- a/config
+++ b/config
@@ -1,14 +1,16 @@
 [setup]
 contact-name = Frank DeMarco
 license = Public Domain
-contact-email = frank.s.demarco@gmail.com
-title = Wind from Heaven's Lake
+contact-email = if.self.end@gmail.com
+title = Wind off of Heaven's Lake
 url = http://A-O.in/
 summary = Consult the oracle while protecting your pulp supply!
-platform = Linux
+platforms = Linux, Windows, Mac OS X
 version = 0.2.0
-init-script = lake-of-heavenly-wind
+init-script = OPEN-GAME 
 package-root = lake_of_heavenly_wind
+additional-packages = lib
+osx-includes = resource, lib, lake_of_heavenly_wind, config
 
 [display]
 font = wt009.ttf

diff --git a/lib/pgfw b/lib/pgfw
index a0aba9a..42f6fcb 160000 (submodule)
--- a/lib/pgfw
+++ b/lib/pgfw
@@ -1 +1 @@
-Subproject commit a0aba9a0bb527ec7f3d7269cdd522448560a99c3
+Subproject commit 42f6fcb9a28c5297cfedbe35cb0785e10917112b

diff --git a/setup-win.py b/setup-win.py
deleted file mode 100644 (file)
index e4a57ea..0000000
--- a/setup-win.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from lake_of_heavenly_wind.pgfw.SetupWin import SetupWin
-
-if __name__ == "__main__":
-    SetupWin().setup()

diff --git a/setup.py b/setup.py
index 60fc0f2..b8b4438 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,13 @@
-import os
-delattr(os, "link")
+from sys import platform
 
-from lake_of_heavenly_wind.pgfw.Setup import Setup
 
 if __name__ == "__main__":
-    Setup().setup()
+    if platform == "darwin":
+       from lib.pgfw.pgfw.SetupOSX import SetupOSX
+        SetupOSX().setup()
+    elif platform == "win32":
+        from lib.pgfw.pgfw.SetupWin import SetupWin
+        SetupWin().setup()
+    else:
+        from lib.pgfw.pgfw.Setup import Setup
+        Setup().setup()