Changeset 178 for trunk/synapse

Timestamp:

09/16/10 04:38:34 (11 years ago)

Author:

sc

Message:

synapse/setup.py:

• release number changed to 0.4.0 considering large rewrites for Python module format
• packaging fixes for new Python module format

synapse/setup.cfg:

• python-matplotlib requirement added

synapse/setup_win32.py:

• py2exe matplotlib requirement added

synapse/puzzlebox_synapse.desktop:

• desktop link moved to Education;Science

Location:

trunk/synapse

Files:

• puzzlebox_synapse.desktop (modified) (2 diffs)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (1 diff)
• setup_win32.py (modified) (2 diffs)

trunk/synapse/puzzlebox_synapse.desktop

@@ -3 +3 @@
 GenericName=EEG Brain Interface
 Comment=Connect to EEG Headsets
-Exec=/usr/bin/env python /usr/lib/python2.6/site-packages/puzzlebox_synapse_interface.py
+Exec=/usr/bin/env python /usr/lib/python2.6/site-packages/synapse-gui.py
 Icon=/usr/share/puzzlebox_synapse/images/puzzlebox.ico
 MimeType=application/x-puzzlebox;
@@ -9 +9 @@
 Encoding=UTF-8
 Type=Application
-Categories=Development;Network;
+Categories=Education;Science;
 X-Desktop-File-Install-Version=0.15

trunk/synapse/setup.cfg

@@ -8 +8 @@
            PyQt4
            python-simplejson
+           python-matplotlib
            pybluez
 #          pyserial

trunk/synapse/setup.py

@@ -30 +30 @@
 setup(
         name='puzzlebox_synapse',
-        version='0.3.4',
+        version='0.4.0',
         description='Puzzlebox Synapse provides a GUI and socket-server interface to commercially available EEG headsets',
         author='Steve Castellotti',
         author_email='sc@puzzlebox.info',
         url='http://brainstorms.puzzlebox.info',
-        py_modules=['puzzlebox_synapse_protocol_thinkgear', \
-                    'puzzlebox_synapse_server_thinkgear', \
-                    'puzzlebox_synapse_client_thinkgear', \
-                    'puzzlebox_synapse_interface', \
-                    'puzzlebox_synapse_interface_design', \
-                    'puzzlebox_synapse_configuration'], \
-        options={"py2exe":{"includes":["sip"], "excludes": ["bluetooth"]}},
-        console=["puzzlebox_synapse_client_thinkgear.py", \
-                 "puzzlebox_synapse_server_thinkgear.py"
+        py_modules=['Puzzlebox', \
+                    'Puzzlebox.Synapse', \
+                    'Puzzlebox.Synapse.Protocol', \
+                    'Puzzlebox.Synapse.Server', \
+                    'Puzzlebox.Synapse.Client', \
+                    'Puzzlebox.Synapse.Interface', \
+                    'Puzzlebox.Synapse.Interface_Design', \
+                    'Puzzlebox.Synapse.Interface_Plot', \
+                    'Puzzlebox.Synapse.Configuration', \
+                    'synapse-protocol', \
+                    'synapse-server', \
+                    'synapse-client', \
+                    'synapse-gui'], \
+        options={"py2exe":{"includes":["sip", "matplotlib"], "excludes": ["bluetooth"]}},
+        console=["synapse-client.py", \
+                 "synapse-server.py", \
+                 "synapse-protocol.py"
         ],
         data_files=[("/etc/puzzlebox_synapse", \
                             ["puzzlebox_synapse_configuration.ini"]),
-                    ("/usr/share/puzzlebox_synapse/images", \
+                         ("/usr/share/puzzlebox_synapse/images", \
                             ["images/puzzlebox.ico", \
                              "images/puzzlebox_logo.png"]),
-                    ("/usr/share/applications", \
+                         ("/usr/share/applications", \
                             ["puzzlebox_synapse.desktop"]),
         ],
         windows=[ \
                 {
-                 "script": "puzzlebox_synapse_interface.py",
+                 "script": "synapse-gui.py",
                  "icon_resources": [(1, \
                  os.path.join("images", "puzzlebox.ico"))]

trunk/synapse/setup_win32.py

@@ -30 +30 @@
 setup(
         name='puzzlebox_synapse',
-        version='0.3.4',
+        version='0.4.0',
         description='Puzzlebox Synapse provides a GUI and socket-server interface to commercially available EEG headsets',
         author='Steve Castellotti',
         author_email='sc@puzzlebox.info',
         url='http://brainstorms.puzzlebox.info',
-        py_modules=['puzzlebox_synapse_protocol_thinkgear', \
-                    'puzzlebox_synapse_server_thinkgear', \
-                    'puzzlebox_synapse_client_thinkgear', \
-                    'puzzlebox_synapse_interface', \
-                    'puzzlebox_synapse_interface_design', \
-                    'puzzlebox_synapse_configuration'], \
-        options={"py2exe":{"includes":["sip"], "excludes": ["bluetooth"]}},
-        console=["puzzlebox_synapse_client_thinkgear.py", \
-                 "puzzlebox_synapse_server_thinkgear.py"
+        py_modules=['Puzzlebox', \
+                    'Puzzlebox.Synapse', \
+                    'Puzzlebox.Synapse.Protocol', \
+                    'Puzzlebox.Synapse.Server', \
+                    'Puzzlebox.Synapse.Client', \
+                    'Puzzlebox.Synapse.Interface', \
+                    'Puzzlebox.Synapse.Interface_Design', \
+                    'Puzzlebox.Synapse.Interface_Plot', \
+                    'Puzzlebox.Synapse.Configuration', \
+                    'synapse-protocol', \
+                    'synapse-server', \
+                    'synapse-client', \
+                    'synapse-gui'], \
+        options={"py2exe":{"includes":["sip", "matplotlib"], "excludes": ["bluetooth"]}},
+        console=["synapse-client.py", \
+                 "synapse-server.py", \
+                 "synapse-protocol.py"
         ],
         data_files=[("", \
@@ -50 +58 @@
                             ["images/puzzlebox.ico", \
                              "images/puzzlebox_logo.png"]),
-#                   ("/usr/share/applications", \
-#                           ["puzzlebox_synapse.desktop"]),
         ],
         windows=[ \