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
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2012-01-22 18:16:22 +0000
3+++ MANIFEST.in 2012-02-20 06:24:25 +0000
4@@ -17,17 +17,18 @@
5 include msp430/asm/librarian/asm/timer_a_uart/putchar_outmod.S
6 include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S
7
8-include scripts/*.py
9+include scripts/msp430-bsl
10+include scripts/msp430-bsl-fcdprog
11 include scripts/msp430-bsl-legacy
12-include scripts/msp430-bsl
13+include scripts/msp430-bsl-telosb
14 include scripts/msp430-compare
15 include scripts/msp430-convert
16 include scripts/msp430-downloader
17 include scripts/msp430-gdb
18 include scripts/msp430-generate
19 include scripts/msp430-hexdump
20+include scripts/msp430-jtag
21 include scripts/msp430-jtag-legacy
22-include scripts/msp430-jtag
23 include scripts/msp430-ram-usage
24 include scripts/msp430-tool
25
26
27=== modified file 'doc/README-msp430-bsl.txt'
28--- doc/README-msp430-bsl.txt 2011-02-16 00:53:32 +0000
29+++ doc/README-msp430-bsl.txt 2012-02-20 06:24:25 +0000
30@@ -37,7 +37,7 @@
31 program can be used to communicate between the PC and the MSP430 device.
32
33 The program can be started by typing "msp430-bsl" in a console.
34-To run it in the source directory, use "python msp430-bsl.py"
35+To run it in the source directory, use "python msp430-bsl"
36
37 Usage: msp430.bsl.target [OPTIONS] [FILE [FILE...]]
38
39
40=== renamed file 'scripts/msp430-bsl.py' => 'scripts/msp430-bsl'
41=== renamed file 'scripts/msp430-bsl-fcdprog.py' => 'scripts/msp430-bsl-fcdprog' (properties changed: -x to +x)
42=== renamed file 'scripts/msp430-bsl-legacy.py' => 'scripts/msp430-bsl-legacy'
43=== renamed file 'scripts/msp430-bsl-telosb.py' => 'scripts/msp430-bsl-telosb' (properties changed: -x to +x)
44=== renamed file 'scripts/msp430-compare.py' => 'scripts/msp430-compare'
45=== renamed file 'scripts/msp430-convert.py' => 'scripts/msp430-convert'
46=== renamed file 'scripts/msp430-downloader.py' => 'scripts/msp430-downloader'
47=== renamed file 'scripts/msp430-gdb.py' => 'scripts/msp430-gdb'
48=== renamed file 'scripts/msp430-generate.py' => 'scripts/msp430-generate'
49=== renamed file 'scripts/msp430-hexdump.py' => 'scripts/msp430-hexdump'
50=== renamed file 'scripts/msp430-jtag.py' => 'scripts/msp430-jtag'
51=== renamed file 'scripts/msp430-jtag-legacy.py' => 'scripts/msp430-jtag-legacy'
52=== renamed file 'scripts/msp430-ram-usage.py' => 'scripts/msp430-ram-usage'
53=== renamed file 'scripts/msp430-tool.py' => 'scripts/msp430-tool'
54=== modified file 'setup.py'
55--- setup.py 2012-02-18 00:44:25 +0000
56+++ setup.py 2012-02-20 06:24:25 +0000
57@@ -42,8 +42,8 @@
58 ]},
59 scripts=[
60 'scripts/msp430-bsl',
61+ 'scripts/msp430-bsl-fcdprog',
62 'scripts/msp430-bsl-legacy',
63- 'scripts/msp430-bsl-fcdprog',
64 'scripts/msp430-bsl-telosb',
65 'scripts/msp430-compare',
66 'scripts/msp430-convert',
67@@ -51,8 +51,8 @@
68 'scripts/msp430-gdb',
69 'scripts/msp430-generate',
70 'scripts/msp430-hexdump',
71+ 'scripts/msp430-jtag',
72 'scripts/msp430-jtag-legacy',
73- 'scripts/msp430-jtag',
74 'scripts/msp430-ram-usage',
75 'scripts/msp430-tool',
76 ],
77
78=== modified file 'win32/setup-combined-tools-py2exe.py'
79--- win32/setup-combined-tools-py2exe.py 2011-11-03 12:48:18 +0000
80+++ win32/setup-combined-tools-py2exe.py 2012-02-20 06:24:25 +0000
81@@ -27,20 +27,20 @@
82 'IronPythonConsole', 'System', 'System.IO.Ports', 'System.Windows.Forms.Clipboard', 'clr',
83 'modes.editingmodes', 'startup', 'Carbon', 'Carbon.Files', 'wx'],
84 'packages': ['msp430', 'msp430.asm', 'msp430.memory', 'msp430.shell',
85- 'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl5'],
86+ 'msp430.gdb', 'msp430.jtag', 'msp430.bsl', 'msp430.bsl.target', 'msp430.bsl5'],
87 'includes': ['pywinusb', 'EasyDialogs'],
88 'dll_excludes': ['HIL.dll', 'MSP430.dll', 'MSP430mspgcc.dll'],
89 'optimize': 2,
90 }
91 },
92 console = [
93- "scripts/msp430-bsl.py",
94- "scripts/msp430-jtag.py",
95- "scripts/msp430-tool.py",
96+ "scripts/msp430-bsl",
97+ "scripts/msp430-jtag",
98+ "scripts/msp430-tool",
99 ],
100 windows = [
101 {
102- 'script': "scripts/msp430-downloader.py",
103+ 'script': "scripts/msp430-downloader",
104 'icon_resources': [(0x0001, 'win32/downloader.ico')]
105 },
106 ],

Subscribers

People subscribed via source and target branches