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

Proposed by Christopher Wilson on 2012-02-20
Status: Merged
Merged at revision: 480
Proposed branch: lp:~cdwilson/python-msp430-tools/fix-bug-936695
Merge into: lp:python-msp430-tools
Diff against target: 106 lines (+12/-11)
4 files modified
MANIFEST.in (+4/-3)
doc/README-msp430-bsl.txt (+1/-1)
setup.py (+2/-2)
win32/setup-combined-tools-py2exe.py (+5/-5)
To merge this branch: bzr merge lp:~cdwilson/python-msp430-tools/fix-bug-936695
Reviewer Review Type Date Requested Status
zsquareplusc 2012-02-20 Pending
Review via email: mp+93767@code.launchpad.net

Description of the change

Fix for bug 936695

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
17include msp430/asm/librarian/asm/timer_a_uart/putchar_outmod.S17include msp430/asm/librarian/asm/timer_a_uart/putchar_outmod.S
18include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S18include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S
1919
20include scripts/*.py20include scripts/msp430-bsl
21include scripts/msp430-bsl-fcdprog
21include scripts/msp430-bsl-legacy22include scripts/msp430-bsl-legacy
22include scripts/msp430-bsl23include scripts/msp430-bsl-telosb
23include scripts/msp430-compare24include scripts/msp430-compare
24include scripts/msp430-convert25include scripts/msp430-convert
25include scripts/msp430-downloader26include scripts/msp430-downloader
26include scripts/msp430-gdb27include scripts/msp430-gdb
27include scripts/msp430-generate28include scripts/msp430-generate
28include scripts/msp430-hexdump29include scripts/msp430-hexdump
30include scripts/msp430-jtag
29include scripts/msp430-jtag-legacy31include scripts/msp430-jtag-legacy
30include scripts/msp430-jtag
31include scripts/msp430-ram-usage32include scripts/msp430-ram-usage
32include scripts/msp430-tool33include scripts/msp430-tool
3334
3435
=== 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 @@
37program can be used to communicate between the PC and the MSP430 device.37program can be used to communicate between the PC and the MSP430 device.
3838
39The program can be started by typing "msp430-bsl" in a console.39The program can be started by typing "msp430-bsl" in a console.
40To run it in the source directory, use "python msp430-bsl.py"40To run it in the source directory, use "python msp430-bsl"
4141
42Usage: msp430.bsl.target [OPTIONS] [FILE [FILE...]]42Usage: msp430.bsl.target [OPTIONS] [FILE [FILE...]]
4343
4444
=== 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 @@
42 ]},42 ]},
43 scripts=[43 scripts=[
44 'scripts/msp430-bsl',44 'scripts/msp430-bsl',
45 'scripts/msp430-bsl-fcdprog',
45 'scripts/msp430-bsl-legacy',46 'scripts/msp430-bsl-legacy',
46 'scripts/msp430-bsl-fcdprog',
47 'scripts/msp430-bsl-telosb',47 'scripts/msp430-bsl-telosb',
48 'scripts/msp430-compare',48 'scripts/msp430-compare',
49 'scripts/msp430-convert',49 'scripts/msp430-convert',
@@ -51,8 +51,8 @@
51 'scripts/msp430-gdb',51 'scripts/msp430-gdb',
52 'scripts/msp430-generate',52 'scripts/msp430-generate',
53 'scripts/msp430-hexdump',53 'scripts/msp430-hexdump',
54 'scripts/msp430-jtag',
54 'scripts/msp430-jtag-legacy',55 'scripts/msp430-jtag-legacy',
55 'scripts/msp430-jtag',
56 'scripts/msp430-ram-usage',56 'scripts/msp430-ram-usage',
57 'scripts/msp430-tool',57 'scripts/msp430-tool',
58 ],58 ],
5959
=== 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 @@
27 'IronPythonConsole', 'System', 'System.IO.Ports', 'System.Windows.Forms.Clipboard', 'clr',27 'IronPythonConsole', 'System', 'System.IO.Ports', 'System.Windows.Forms.Clipboard', 'clr',
28 'modes.editingmodes', 'startup', 'Carbon', 'Carbon.Files', 'wx'],28 'modes.editingmodes', 'startup', 'Carbon', 'Carbon.Files', 'wx'],
29 'packages': ['msp430', 'msp430.asm', 'msp430.memory', 'msp430.shell',29 'packages': ['msp430', 'msp430.asm', 'msp430.memory', 'msp430.shell',
30 'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl5'],30 'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl.target', 'msp430.bsl5'],
31 'includes': ['pywinusb', 'EasyDialogs'],31 'includes': ['pywinusb', 'EasyDialogs'],
32 'dll_excludes': ['HIL.dll', 'MSP430.dll', 'MSP430mspgcc.dll'],32 'dll_excludes': ['HIL.dll', 'MSP430.dll', 'MSP430mspgcc.dll'],
33 'optimize': 2,33 'optimize': 2,
34 }34 }
35 },35 },
36 console = [36 console = [
37 "scripts/msp430-bsl.py",37 "scripts/msp430-bsl",
38 "scripts/msp430-jtag.py",38 "scripts/msp430-jtag",
39 "scripts/msp430-tool.py",39 "scripts/msp430-tool",
40 ],40 ],
41 windows = [41 windows = [
42 {42 {
43 'script': "scripts/msp430-downloader.py",43 'script': "scripts/msp430-downloader",
44 'icon_resources': [(0x0001, 'win32/downloader.ico')]44 'icon_resources': [(0x0001, 'win32/downloader.ico')]
45 },45 },
46 ],46 ],

Subscribers

People subscribed via source and target branches