Merge lp:~cdwilson/python-msp430-tools/setup-py-fixes into lp:python-msp430-tools

Proposed by Christopher Wilson on 2012-01-22
Status: Merged
Merged at revision: 445
Proposed branch: lp:~cdwilson/python-msp430-tools/setup-py-fixes
Merge into: lp:python-msp430-tools
Diff against target: 92 lines (+38/-1)
2 files modified
MANIFEST.in (+12/-0)
setup.py (+26/-1)
To merge this branch: bzr merge lp:~cdwilson/python-msp430-tools/setup-py-fixes
Reviewer Review Type Date Requested Status
zsquareplusc 2012-01-22 Approve on 2012-01-26
Review via email: mp+89601@code.launchpad.net
To post a comment you must log in.
zsquareplusc (zsquareplusc) wrote :

Thanks, merged

review: Approve

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 2011-11-01 22:47:51 +0000
3+++ MANIFEST.in 2012-01-22 18:23:52 +0000
4@@ -18,6 +18,18 @@
5 include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S
6
7 include scripts/*.py
8+include scripts/msp430-bsl-legacy
9+include scripts/msp430-bsl
10+include scripts/msp430-compare
11+include scripts/msp430-convert
12+include scripts/msp430-downloader
13+include scripts/msp430-gdb
14+include scripts/msp430-generate
15+include scripts/msp430-hexdump
16+include scripts/msp430-jtag-legacy
17+include scripts/msp430-jtag
18+include scripts/msp430-ram-usage
19+include scripts/msp430-tool
20
21 include doc/*.rst
22 include doc/*.txt
23
24=== added symlink 'scripts/msp430-bsl'
25=== target is u'msp430-bsl.py'
26=== added symlink 'scripts/msp430-bsl-legacy'
27=== target is u'msp430-bsl-legacy.py'
28=== added symlink 'scripts/msp430-compare'
29=== target is u'msp430-compare.py'
30=== added symlink 'scripts/msp430-convert'
31=== target is u'msp430-convert.py'
32=== added symlink 'scripts/msp430-downloader'
33=== target is u'msp430-downloader.py'
34=== added symlink 'scripts/msp430-gdb'
35=== target is u'msp430-gdb.py'
36=== added symlink 'scripts/msp430-generate'
37=== target is u'msp430-generate.py'
38=== added symlink 'scripts/msp430-hexdump'
39=== target is u'msp430-hexdump.py'
40=== added symlink 'scripts/msp430-jtag'
41=== target is u'msp430-jtag.py'
42=== added symlink 'scripts/msp430-jtag-legacy'
43=== target is u'msp430-jtag-legacy.py'
44=== added symlink 'scripts/msp430-ram-usage'
45=== target is u'msp430-ram-usage.py'
46=== added symlink 'scripts/msp430-tool'
47=== target is u'msp430-tool.py'
48=== modified file 'scripts/msp430-tool.py' (properties changed: -x to +x)
49=== modified file 'setup.py'
50--- setup.py 2011-11-01 22:49:09 +0000
51+++ setup.py 2012-01-22 18:23:52 +0000
52@@ -18,7 +18,18 @@
53 author="Chris Liechti",
54 author_email="cliechti@gmx.net",
55 url="http://launchpad.net/python-msp430-tools/",
56- packages=['msp430'],
57+ packages=[
58+ 'msp430',
59+ 'msp430.asm',
60+ 'msp430.bsl',
61+ 'msp430.bsl5',
62+ 'msp430.gdb',
63+ 'msp430.jtag',
64+ 'msp430.legacy',
65+ 'msp430.listing',
66+ 'msp430.memory',
67+ 'msp430.shell',
68+ ],
69 package_dir={'msp430': 'msp430'},
70 package_data={'msp430': [
71 'msp430/asm/definitions/msp430-mcu-list.txt',
72@@ -28,6 +39,20 @@
73 'msp430/bsl/patch.txt',
74 'msp430/bsl5/RAM_BSL.00.05.04.34.txt',
75 ]},
76+ scripts=[
77+ 'scripts/msp430-bsl-legacy',
78+ 'scripts/msp430-bsl',
79+ 'scripts/msp430-compare',
80+ 'scripts/msp430-convert',
81+ 'scripts/msp430-downloader',
82+ 'scripts/msp430-gdb',
83+ 'scripts/msp430-generate',
84+ 'scripts/msp430-hexdump',
85+ 'scripts/msp430-jtag-legacy',
86+ 'scripts/msp430-jtag',
87+ 'scripts/msp430-ram-usage',
88+ 'scripts/msp430-tool',
89+ ],
90 license="Simplified BSD License",
91 long_description=open('README.txt').read(),
92 classifiers = [

Subscribers

People subscribed via source and target branches