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

[Christopher Wilson]

Fixes for bugs https://bugs.launchpad.net/python-msp430-tools/+bug/919912 and https://bugs.launchpad.net/python-msp430-tools/+bug/919918

[zsquareplusc (zsquareplusc)]

Thanks, merged

review: Approve

=== 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 @@
 include msp430/asm/librarian/asm/timer_a_uart/receive_interrupt.S
 
 include scripts/*.py
+include scripts/msp430-bsl-legacy
+include scripts/msp430-bsl
+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-legacy
+include scripts/msp430-jtag
+include scripts/msp430-ram-usage
+include scripts/msp430-tool
 
 include doc/*.rst
 include doc/*.txt
 
=== 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 @@
     author="Chris Liechti",
     author_email="[e-mail]",
     url="http://launchpad.net/python-msp430-tools/",
-    packages=['msp430'],
+    packages=[
+            'msp430',
+            'msp430.asm',
+            'msp430.bsl',
+            'msp430.bsl5',
+            'msp430.gdb',
+            'msp430.jtag',
+            'msp430.legacy',
+            'msp430.listing',
+            'msp430.memory',
+            'msp430.shell',
+            ],
     package_dir={'msp430': 'msp430'},
     package_data={'msp430': [
             'msp430/asm/definitions/msp430-mcu-list.txt',
@@ -28,6 +39,20 @@
             'msp430/bsl/patch.txt',
             'msp430/bsl5/RAM_BSL.00.05.04.34.txt',
             ]},
+    scripts=[
+            'scripts/msp430-bsl-legacy',
+            'scripts/msp430-bsl',
+            'scripts/msp430-compare',
+            'scripts/msp430-convert',
+            'scripts/msp430-downloader',
+            'scripts/msp430-gdb',
+            'scripts/msp430-generate',
+            'scripts/msp430-hexdump',
+            'scripts/msp430-jtag-legacy',
+            'scripts/msp430-jtag',
+            'scripts/msp430-ram-usage',
+            'scripts/msp430-tool',
+            ],
     license="Simplified BSD License",
     long_description=open('README.txt').read(),
     classifiers = [