Merge lp:~cdwilson/python-msp430-tools/fix-bug-936695 into lp:python-msp430-tools

[Christopher Wilson]

Fix for bug 936695

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-01-22 18:16:22 +0000
+++ MANIFEST.in	2012-02-20 06:24:25 +0000
@@ -17,17 +17,18 @@
 include msp430/asm/librarian/asm/timer_a_uart/putchar_outmod.S
 include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S
 
-include scripts/*.py
+include scripts/msp430-bsl
+include scripts/msp430-bsl-fcdprog
 include scripts/msp430-bsl-legacy
-include scripts/msp430-bsl
+include scripts/msp430-bsl-telosb
 include scripts/msp430-compare
 include scripts/msp430-convert
 include scripts/msp430-downloader
 include scripts/msp430-gdb
 include scripts/msp430-generate
 include scripts/msp430-hexdump
+include scripts/msp430-jtag
 include scripts/msp430-jtag-legacy
-include scripts/msp430-jtag
 include scripts/msp430-ram-usage
 include scripts/msp430-tool
 
 
=== modified file 'doc/README-msp430-bsl.txt'
--- doc/README-msp430-bsl.txt	2011-02-16 00:53:32 +0000
+++ doc/README-msp430-bsl.txt	2012-02-20 06:24:25 +0000
@@ -37,7 +37,7 @@
 program can be used to communicate between the PC and the MSP430 device.
 
 The program can be started by typing "msp430-bsl" in a console.
-To run it in the source directory, use "python msp430-bsl.py"
+To run it in the source directory, use "python msp430-bsl"
 
 Usage: msp430.bsl.target [OPTIONS] [FILE [FILE...]]
 
 
=== renamed file 'scripts/msp430-bsl.py' => 'scripts/msp430-bsl'
=== renamed file 'scripts/msp430-bsl-fcdprog.py' => 'scripts/msp430-bsl-fcdprog' (properties changed: -x to +x)
=== renamed file 'scripts/msp430-bsl-legacy.py' => 'scripts/msp430-bsl-legacy'
=== renamed file 'scripts/msp430-bsl-telosb.py' => 'scripts/msp430-bsl-telosb' (properties changed: -x to +x)
=== renamed file 'scripts/msp430-compare.py' => 'scripts/msp430-compare'
=== renamed file 'scripts/msp430-convert.py' => 'scripts/msp430-convert'
=== renamed file 'scripts/msp430-downloader.py' => 'scripts/msp430-downloader'
=== renamed file 'scripts/msp430-gdb.py' => 'scripts/msp430-gdb'
=== renamed file 'scripts/msp430-generate.py' => 'scripts/msp430-generate'
=== renamed file 'scripts/msp430-hexdump.py' => 'scripts/msp430-hexdump'
=== renamed file 'scripts/msp430-jtag.py' => 'scripts/msp430-jtag'
=== renamed file 'scripts/msp430-jtag-legacy.py' => 'scripts/msp430-jtag-legacy'
=== renamed file 'scripts/msp430-ram-usage.py' => 'scripts/msp430-ram-usage'
=== renamed file 'scripts/msp430-tool.py' => 'scripts/msp430-tool'
=== modified file 'setup.py'
--- setup.py	2012-02-18 00:44:25 +0000
+++ setup.py	2012-02-20 06:24:25 +0000
@@ -42,8 +42,8 @@
             ]},
     scripts=[
             'scripts/msp430-bsl',
+            'scripts/msp430-bsl-fcdprog',
             'scripts/msp430-bsl-legacy',
-            'scripts/msp430-bsl-fcdprog',
             'scripts/msp430-bsl-telosb',
             'scripts/msp430-compare',
             'scripts/msp430-convert',
@@ -51,8 +51,8 @@
             'scripts/msp430-gdb',
             'scripts/msp430-generate',
             'scripts/msp430-hexdump',
+            'scripts/msp430-jtag',
             'scripts/msp430-jtag-legacy',
-            'scripts/msp430-jtag',
             'scripts/msp430-ram-usage',
             'scripts/msp430-tool',
             ],
 
=== modified file 'win32/setup-combined-tools-py2exe.py'
--- win32/setup-combined-tools-py2exe.py	2011-11-03 12:48:18 +0000
+++ win32/setup-combined-tools-py2exe.py	2012-02-20 06:24:25 +0000
@@ -27,20 +27,20 @@
                     'IronPythonConsole', 'System', 'System.IO.Ports', 'System.Windows.Forms.Clipboard', 'clr',
                     'modes.editingmodes', 'startup', 'Carbon', 'Carbon.Files', 'wx'],
             'packages': ['msp430', 'msp430.asm', 'msp430.memory', 'msp430.shell',
-                        'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl5'],
+                        'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl.target', 'msp430.bsl5'],
             'includes': ['pywinusb', 'EasyDialogs'],
             'dll_excludes': ['HIL.dll', 'MSP430.dll', 'MSP430mspgcc.dll'],
             'optimize': 2,
         }
     },
     console = [
-        "scripts/msp430-bsl.py",
-        "scripts/msp430-jtag.py",
-        "scripts/msp430-tool.py",
+        "scripts/msp430-bsl",
+        "scripts/msp430-jtag",
+        "scripts/msp430-tool",
     ],
     windows = [
         {
-            'script': "scripts/msp430-downloader.py",
+            'script': "scripts/msp430-downloader",
             'icon_resources': [(0x0001, 'win32/downloader.ico')]
         },
     ],