Changeset 181 for trunk/synapse

Timestamp:

09/17/10 00:34:14 (11 years ago)

Author:

sc

Message:

synapse/setup.py:

• merged win32 version into same setup.py file

synapse/scripts/display_windows_requirements.sh:

• initial checkin

synapse/setup.cfg:

• added pyserial requirement for serialWrapper class

synapse/Puzzlebox/Synapse/Protocol.py:

• import pyserial even under Linux for serialWrapper class

synapse/setup_win32.py:

• minor data_files glob import typo fixed

Location:

trunk/synapse

Files:

• Puzzlebox/Synapse/Protocol.py (modified) (1 diff)
• scripts/display_windows_requirements.sh (added)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (3 diffs)
• setup_win32.py (modified) (1 diff)

trunk/synapse/Puzzlebox/Synapse/Protocol.py

@@ -69 +69 @@
 import sys
 import signal
+import serial
 
 if (sys.platform != 'win32'):
         import bluetooth
-else:
-        import serial
 
 try:

trunk/synapse/setup.cfg

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

trunk/synapse/setup.py

@@ -8 +8 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.09.15
+# Last Update: 2010.09.16
 #
 #####################################################################
@@ -27 +27 @@
         
         sys.exit()
+
+
+if (sys.platform == 'win32'):
+        options={"py2exe": { \
+                    "includes": [ \
+                       "sip", #"PyQt4._qt", \
+                       "numpy", "pylab", \
+                       "matplotlib", \
+                       "matplotlib.backends", \
+                       "matplotlib.backends.backend_qt4agg", \
+                       "matplotlib.figure", \
+                       "matplotlib.numerix.fft", \
+                       "matplotlib.numerix.linear_algebra", \
+                       "matplotlib.numerix.random_array", \
+                       "matplotlib.backends.backend_tkagg"], \
+                    "excludes": [ \
+                       "bluetooth", "tcl", \
+                       '_gtkagg', '_tkagg', '_agg2', \
+                       '_cairo', '_cocoaagg', \
+                       '_fltkagg', '_gtk', '_gtkcairo'], \
+                    "dll_excludes": [ \
+                       'tcl84.dll', 'tk84.dll' \
+                       'libgdk-win32-2.0-0.dll',
+                       'libgobject-2.0-0.dll'], \
+                    #"packages": ["pytz"], \
+                    "compressed": 2, \
+                    "optimize": 2, \
+                    "bundle_files": 2, \
+                    "dist_dir": "dist", \
+                    "xref": False, \
+                    "skip_archive": False, \
+                 }
+        }
+        
+        data_files=[("", \
+                       ["puzzlebox_synapse_configuration.ini"]),
+                    ("images", \
+                       ["images/puzzlebox.ico", \
+                        "images/puzzlebox_logo.png"]),
+                    (r'mpl-data', \
+                       glob.glob(r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\*.*')), \
+                    (r'mpl-data', \
+                       [r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']), \
+                    (r'mpl-data\images', \
+                       glob.glob(r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\images\*.*')), \
+                    (r'mpl-data\fonts', \
+                       glob.glob(r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\fonts\*.*')), \
+        ]
+
+else:
+        options={}
+        data_files=[("/etc/puzzlebox_synapse", \
+                       ["puzzlebox_synapse_configuration.ini"]),
+                    ("/usr/share/puzzlebox_synapse/images", \
+                       ["images/puzzlebox.ico", \
+                        "images/puzzlebox_logo.png"]),
+                    ("/usr/share/applications", \
+                       ["puzzlebox_synapse.desktop"]),
+                   ]
+
 
 setup(
@@ -48 +108 @@
                     '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", \
-                            ["images/puzzlebox.ico", \
-                             "images/puzzlebox_logo.png"]),
-                         ("/usr/share/applications", \
-                            ["puzzlebox_synapse.desktop"]),
-        ],
+        options=options, \
+        zipfile = r'lib\library.zip',
+        data_files=data_files, \
         windows=[ \
                 {

trunk/synapse/setup_win32.py

@@ -83 +83 @@
                              glob.glob(r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\*.*')), \
                     (r'mpl-data', \
-                             [r'C:\Python25\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']), \
+                             [r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\matplotlibrc']), \
                     (r'mpl-data\images', \
                              glob.glob(r'C:\Python26\Lib\site-packages\matplotlib\mpl-data\images\*.*')), \