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
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2011-11-01 22:47:51 +0000
+++ MANIFEST.in 2012-01-22 18:23:52 +0000
@@ -18,6 +18,18 @@
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/*.py
21include scripts/msp430-bsl-legacy
22include scripts/msp430-bsl
23include scripts/msp430-compare
24include scripts/msp430-convert
25include scripts/msp430-downloader
26include scripts/msp430-gdb
27include scripts/msp430-generate
28include scripts/msp430-hexdump
29include scripts/msp430-jtag-legacy
30include scripts/msp430-jtag
31include scripts/msp430-ram-usage
32include scripts/msp430-tool
2133
22include doc/*.rst34include doc/*.rst
23include doc/*.txt35include doc/*.txt
2436
=== added symlink 'scripts/msp430-bsl'
=== target is u'msp430-bsl.py'
=== added symlink 'scripts/msp430-bsl-legacy'
=== target is u'msp430-bsl-legacy.py'
=== added symlink 'scripts/msp430-compare'
=== target is u'msp430-compare.py'
=== added symlink 'scripts/msp430-convert'
=== target is u'msp430-convert.py'
=== added symlink 'scripts/msp430-downloader'
=== target is u'msp430-downloader.py'
=== added symlink 'scripts/msp430-gdb'
=== target is u'msp430-gdb.py'
=== added symlink 'scripts/msp430-generate'
=== target is u'msp430-generate.py'
=== added symlink 'scripts/msp430-hexdump'
=== target is u'msp430-hexdump.py'
=== added symlink 'scripts/msp430-jtag'
=== target is u'msp430-jtag.py'
=== added symlink 'scripts/msp430-jtag-legacy'
=== target is u'msp430-jtag-legacy.py'
=== added symlink 'scripts/msp430-ram-usage'
=== target is u'msp430-ram-usage.py'
=== added symlink 'scripts/msp430-tool'
=== target is u'msp430-tool.py'
=== modified file 'scripts/msp430-tool.py' (properties changed: -x to +x)
=== modified file 'setup.py'
--- setup.py 2011-11-01 22:49:09 +0000
+++ setup.py 2012-01-22 18:23:52 +0000
@@ -18,7 +18,18 @@
18 author="Chris Liechti",18 author="Chris Liechti",
19 author_email="cliechti@gmx.net",19 author_email="cliechti@gmx.net",
20 url="http://launchpad.net/python-msp430-tools/",20 url="http://launchpad.net/python-msp430-tools/",
21 packages=['msp430'],21 packages=[
22 'msp430',
23 'msp430.asm',
24 'msp430.bsl',
25 'msp430.bsl5',
26 'msp430.gdb',
27 'msp430.jtag',
28 'msp430.legacy',
29 'msp430.listing',
30 'msp430.memory',
31 'msp430.shell',
32 ],
22 package_dir={'msp430': 'msp430'},33 package_dir={'msp430': 'msp430'},
23 package_data={'msp430': [34 package_data={'msp430': [
24 'msp430/asm/definitions/msp430-mcu-list.txt',35 'msp430/asm/definitions/msp430-mcu-list.txt',
@@ -28,6 +39,20 @@
28 'msp430/bsl/patch.txt',39 'msp430/bsl/patch.txt',
29 'msp430/bsl5/RAM_BSL.00.05.04.34.txt',40 'msp430/bsl5/RAM_BSL.00.05.04.34.txt',
30 ]},41 ]},
42 scripts=[
43 'scripts/msp430-bsl-legacy',
44 'scripts/msp430-bsl',
45 'scripts/msp430-compare',
46 'scripts/msp430-convert',
47 'scripts/msp430-downloader',
48 'scripts/msp430-gdb',
49 'scripts/msp430-generate',
50 'scripts/msp430-hexdump',
51 'scripts/msp430-jtag-legacy',
52 'scripts/msp430-jtag',
53 'scripts/msp430-ram-usage',
54 'scripts/msp430-tool',
55 ],
31 license="Simplified BSD License",56 license="Simplified BSD License",
32 long_description=open('README.txt').read(),57 long_description=open('README.txt').read(),
33 classifiers = [58 classifiers = [

Subscribers

People subscribed via source and target branches