rearranged the files into packages

ChangeLog

@@ -1,4 +1,7 @@
 ================= version 2.0.4 ( yet to be released) ============
+* Uninstall script works better
+* Is now distributed as a python package.  This makes things easier
+for maintanence
 * Is now installable 
 * Disabled gamepad GUI until joystick support can be completed
 * Initial joystick config support: supports buttons, but hot hats and axes

INSTALL

@@ -1,31 +1,18 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! IMPORTANT NOTE
-! The setup script is broken right now.
-! To workaround, just run gfceux out of the source directory.
-!
-! $ python ./gfceux
-!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 You can install gfceux with setup.py:
 
 $ sudo python setup.py install --prefix=/usr/local
 
 You can change the prefix to whatever you like.
 
-FIXME - 12/5/2008 - You can only run gfceux out of its source folder.
-
 Requirements:
 Python (tested with 2.5); (Ubuntu package name:  python) 
   NOTE: gfceux is not yet compatible with python 3.x
 PyGTK and GTK;  (Ubuntu package name: (python-gtk2 libgtk2.0-0)
 Fceux 2.x
 
-Recommended dependencies
-Pygame (Ubuntu package name: python-pygame) - This will allow graphical conifguraion of input
-
 NOTE: fceu 1.x is no longer supported in the gfceu 2.x series.  
       If you still want/need a front-end for gfceu use gfceu 0.x
       
-
+ALSO NOTE: you can no longer run gfceux from the source directory.
+    You need to run the install script and then run the app.
 

MANIFEST

@@ -1,12 +0,0 @@
-gfceux
-get_key.py
-config_parse.py
-setup.py
-COPYING
-ChangeLog
-INSTALL
-TODO
-gfceux.xml
-gfceux.desktop
-gfceux.png
-gfceux_big.png

TODO

@@ -1,9 +1,7 @@
 TODO:
-* clean setup.py
 * implement UI for --special (combo box)
 * use combo box for bpp
 * use combo box to select gamepad to configure, simply UI
-* update build scripts to reflect new files
 * joystick input support
 * hotkey config
 * resolution

mockup_test.py

@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-# displays mockup of gamepad config
-import gtk
-
-glade_file = 'gfceux.xml'
-print "Using: " + glade_file
-widgets = gtk.Builder()
-widgets.add_from_file(glade_file)
-
-widgets.get_object('gamepad_config_window').show_all()
-gtk.main ()
-

setup.py

@@ -1,12 +1,22 @@
 #!/usr/bin/env python
+
 from distutils.core import setup
+
 setup(name="gfceux",
 		version="2.0.4",
 		scripts = ['gfceux'],
-		data_files=[('share/gfceux/',['gfceux.xml', 'gfceux_big.png', 'gfceux.png']),
-                ('share/pixmaps/', ['gfceux.png']),
-                ('share/man/man1/', ['gfceux.1']),
-      			    ('share/applications/', ['gfceux.desktop'])],
+		packages = ['gfceux'],
+    	package_dir = {'gfceux': 'src'},
+		data_files=[
+		    ('share/gfceux/',
+		    ['data/gfceux.xml', 'data/gfceux_big.png', 'data/gfceux.png',
+		    'COPYING']),
+            ('share/pixmaps/',
+            ['data/gfceux.png']),
+            ('share/man/man1/',
+            ['data/gfceux.1']),
+            ('share/applications/',
+            ['data/gfceux.desktop'])],
 		author = "Lukas Sabota",
 		author_email = "ltsmooth42 _at_ gmail.com",
 		url = "http://dietschnitzel.com/gfceu"

src/main.py

@@ -28,9 +28,9 @@ import sys
 import os
 import pickle
 import shutil
-from optparse import OptionParser
+#from optparse import OptionParser
 #from config_parse import FceuxConfigParser
-import get_key
+#import get_key
 #from subprocess import Popen
 
 try:
@@ -659,7 +659,4 @@ class GfceuxApp:
         gtk.main_quit()
 
 if __name__ == '__main__':
-    parser = OptionParser(version='%prog '+ version)
-    parser.parse_args()
-
     app = GfceuxApp()

uninstall.py

@@ -5,19 +5,33 @@
 #
 # sudo ./uninstall.py [prefix]
 #
+# prefix must include slash at end
+#TODO: fix that
+#TODO: remove python package? (site-package/gfceux/etc)
 
 import os
 import dircache
-prefix = "/usr/"
-if sys.argv[1]:
-  prefix == sys.argv[1]
+import sys
 
-files = ['share/pixmaps/gfceux.png', 'share/man/man1/gfceux.1', 
-  'share/applications/gfceux.desktop', 'bin/gfceux']
-for x in dircache.listdir(prefix+"share/gfceux"):
-  files.append("share/gfceux/"+x)
+prefix = "/usr/"
+try:
+    if sys.argv[1]:
+        prefix = sys.argv[1]
+except IndexError:
+    pass
+
+# first include data places scattered in /usr
+files = [
+    "share/pixmaps/gfceux.png",
+    "share/man/man1/gfceux.1", 
+    "share/applications/gfceux.desktop",
+    "bin/gfceux"]
+# then include the files in our /usr/share/gfceux
+for x in dircache.listdir(prefix + "share/gfceux"):
+  files.append("share/gfceux/" + x)
 
 for x in files:
   os.remove(prefix+x)
-  
+
+# go ahead and remove our shared folder if its empty 
 os.rmdir(prefix+"share/gfceux")