Changeset 140


Ignore:
Timestamp:
08/03/10 07:02:18 (11 years ago)
Author:
sc
Message:

.nsi:

  • packaged for 0.2.4 release

setup.py:

  • packaged for 0.2.4 release

serial_protocol:

  • updated to not attempt to import bluetooth module under Windows
Location:
thinkgear_emulator
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • thinkgear_emulator/Puzzlebox-ThinkGearEmulator.nsi

    r118 r140  
    1 ; Puzzlebox Brainstorms Windows Installer 
     1; Puzzlebox ThinkGear Emulator Windows Installer 
    22 
    33; NOTE: this .NSI script is designed for NSIS v1.8+ 
    44 
    55Name "Puzzlebox ThinkGear Emulator" 
    6 OutFile "Puzzlebox-ThinkGearEmulator-0.2.0-setup.exe" 
     6OutFile "Puzzlebox-ThinkGearEmulator-0.2.4-setup.exe" 
    77 
    88; Some default compiler settings (uncomment and change at will): 
     
    3131WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox ThinkGear Emulator\Puzzlebox ThinkGear Emulator" "UninstallString" '"$INSTDIR\Puzzlesbox-ThinkGearEmulator-Uninstall.exe"' 
    3232       
     33 File dist\_ctypes.pyd 
     34 File dist\_socket.pyd 
     35 File dist\_ssl.pyd 
    3336 File dist\bz2.pyd 
    3437 File dist\libgcc_s_dw2-1.dll 
     
    4346 File dist\QtCore4.dll 
    4447 File dist\QtNetwork4.dll 
     48 File dist\select.pyd 
    4549 File dist\simplejson._speedups.pyd 
    4650 File dist\sip.pyd 
     
    5256 File dist\images\puzzlebox.ico 
    5357 
    54  File package\vcredist_x86.exe 
    5558 
    5659ExecWait 'package\Vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"' 
     
    9396 
    9497 
     98 Delete $INSTDIR\_ctypes.pyd 
     99 Delete $INSTDIR\_socket.pyd 
     100 Delete $INSTDIR\_ssl.pyd 
    95101 Delete $INSTDIR\bz2.pyd 
    96102 Delete $INSTDIR\libgcc_s_dw2-1.dll 
     
    105111 Delete $INSTDIR\QtCore4.dll 
    106112 Delete $INSTDIR\QtNetwork4.dll 
     113 Delete $INSTDIR\select.pyd 
    107114 Delete $INSTDIR\simplejson._speedups.pyd 
    108115 Delete $INSTDIR\sip.pyd 
  • thinkgear_emulator/puzzlebox_thinkgear_emulator_setup.py

    r90 r140  
    88# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    99# 
    10 # Last Update: 2010.07.08 
     10# Last Update: 2010.08.02 
    1111# 
    1212##################################################################### 
     
    2525setup( 
    2626        name='Puzzlebox ThinkGear Emulator', 
    27         version='0.2.0', 
     27        version='0.2.4', 
    2828        description='Puzzlebox ThinkGear Emulator', 
    2929        author='Steve Castellotti', 
    3030        author_email='sc@puzzlebox.info', 
    3131        url='http://brainstorms.puzzlebox.info', 
    32         options={"py2exe":{"includes":["sip"]}}, 
     32        options={"py2exe":{"includes":["sip"], "excludes": ["bluetooth"]}}, 
    3333        console=["puzzlebox_thinkgear_server.py", 
    3434        ], 
  • thinkgear_emulator/puzzlebox_thinkgear_serial_protocol.py

    r139 r140  
    5555import signal 
    5656 
    57 import bluetooth 
    5857import serial 
     58 
     59if (sys.platform != 'win32'): 
     60        import bluetooth 
    5961 
    6062try: 
Note: See TracChangeset for help on using the changeset viewer.