Changeset 279


Ignore:
Timestamp:
08/15/11 16:05:20 (10 years ago)
Author:
sc
Message:
  • Windows 0.5.0 release
  • PySide? compatibility
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Puzzlebox-Synapse.nsi

    r276 r279  
    44 
    55Name "Puzzlebox Synapse" 
    6 OutFile "Puzzlebox-Synapse-0.4.3-setup.exe" 
     6OutFile "Puzzlebox-Synapse-0.5.0-setup.exe" 
    77 
    88; Some default compiler settings (uncomment and change at will): 
     
    3131 
    3232SetOutPath "$INSTDIR" 
    33  File dist\msvcr71.dll 
     33; File dist\msvcr71.dll 
    3434 File dist\puzzlebox_synapse_configuration.ini 
    35  File dist\python25.dll 
     35; File dist\python25.dll 
     36 File dist\python27.dll 
    3637 File dist\synapse-client.exe 
    3738 File dist\synapse-gui.exe 
     
    439440 
    440441 
     442;SetOutPath $INSTDIR\package 
     443; File package\vcredist_x86.exe 
     444; 
     445;ExecWait 'package\Vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"' 
     446 
    441447SetOutPath $INSTDIR\package 
    442  File ..\packaging\win32\vcredist_x86.exe 
     448 File packaging\win32\vcredist_x86.exe 
    443449 
    444450ExecWait '"$INSTDIR\package\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"' 
     
    860866 Delete $INSTDIR\mpl-data\matplotlib.conf 
    861867 Delete $INSTDIR\mpl-data\matplotlibrc 
    862  Delete $INSTDIR\msvcr71.dll 
     868; Delete $INSTDIR\msvcr71.dll 
    863869 Delete $INSTDIR\puzzlebox_synapse_configuration.ini 
    864  Delete $INSTDIR\python25.dll 
     870; Delete $INSTDIR\python25.dll 
     871 Delete $INSTDIR\python27.dll 
    865872 Delete $INSTDIR\synapse-client.exe 
    866873 Delete $INSTDIR\synapse-gui.exe 
  • trunk/Puzzlebox/Synapse/Server.py

    r274 r279  
    99 
    1010__changelog__ = """\ 
    11 Last Update: 2011.03.11 
     11Last Update: 2011.08.15 
    1212 
    1313""" 
     
    2323try: 
    2424        import PySide as PyQt4 
    25         from PySide import QtCore, QtGui# , QtNetwork 
     25        from PySide import QtCore, QtGui, QtNetwork 
    2626except: 
    2727        print "Using PyQt4 module" 
    28         from PyQt4 import QtCore, QtGui#, QtNetwork 
     28        from PyQt4 import QtCore, QtGui, QtNetwork 
    2929else: 
    3030        print "Using PySide module" 
    3131 
    32 from PyQt4 import QtNetwork 
     32#from PyQt4 import QtNetwork 
    3333 
    3434import Configuration as configuration 
  • trunk/setup.py

    r276 r279  
    88# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    99# 
    10 # Last Update: 2010.09.16 
     10# Last Update: 2011.08.15 
    1111# 
    1212##################################################################### 
     
    3737        options={"py2exe": { \ 
    3838                    "includes": [ \ 
    39                        "sip", #"PyQt4._qt", \ 
     39                       #"sip", #"PyQt4._qt", \ 
    4040                       "numpy", "pylab", \ 
    4141                       "matplotlib", \ 
     
    5555                       'tcl84.dll', 'tk84.dll' \ 
    5656                       'libgdk-win32-2.0-0.dll', 
    57                        'libgobject-2.0-0.dll'], \ 
     57                       'libgobject-2.0-0.dll', \ 
     58                       'MSVCP90.dll', \ 
     59                       ], \ 
    5860                    #"packages": ["pytz"], \ 
    5961                    "compressed": 2, \ 
     
    9496setup( 
    9597        name='puzzlebox_synapse', 
    96         version='0.4.3', 
     98        version='0.5.0', 
    9799        description='Puzzlebox Synapse provides a GUI and socket-server interface to commercially available EEG headsets', 
    98100        author='Steve Castellotti', 
Note: See TracChangeset for help on using the changeset viewer.