mbed-tools package improvements

- install all the needed components
- use a customized version of private_settings.py. Projects using mbed-tools
  will be able to use mbed_settings.py instead of private_settings.py. This
  ensures compatibility with the current structure.

MANIFEST

@@ -1,96 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-LICENSE
-setup.py
-workspace_tools/__init__.py
-workspace_tools/__init__.pyc
-workspace_tools/autotest.py
-workspace_tools/build.py
-workspace_tools/build_api.py
-workspace_tools/build_release.py
-workspace_tools/client.py
-workspace_tools/export_test.py
-workspace_tools/hooks.py
-workspace_tools/libraries.py
-workspace_tools/make.py
-workspace_tools/options.py
-workspace_tools/patch.py
-workspace_tools/paths.py
-workspace_tools/project.py
-workspace_tools/server.py
-workspace_tools/settings.py
-workspace_tools/size.py
-workspace_tools/syms.py
-workspace_tools/synch.py
-workspace_tools/targets.py
-workspace_tools/tests.py
-workspace_tools/utils.py
-workspace_tools/data/__init__.py
-workspace_tools/data/example_test_spec.json
-workspace_tools/data/support.py
-workspace_tools/data/rpc/RPCClasses.h
-workspace_tools/data/rpc/class.cpp
-workspace_tools/dev/__init__.py
-workspace_tools/dev/dsp_fir.py
-workspace_tools/dev/rpc_classes.py
-workspace_tools/export/__init__.py
-workspace_tools/export/codered.py
-workspace_tools/export/codered_lpc1768_cproject.tmpl
-workspace_tools/export/codered_lpc1768_project.tmpl
-workspace_tools/export/codered_lpc4088_cproject.tmpl
-workspace_tools/export/codered_lpc4088_project.tmpl
-workspace_tools/export/codesourcery.py
-workspace_tools/export/codesourcery_lpc1768.tmpl
-workspace_tools/export/ds5_5.py
-workspace_tools/export/ds5_5_lpc11u24.cproject.tmpl
-workspace_tools/export/ds5_5_lpc11u24.launch.tmpl
-workspace_tools/export/ds5_5_lpc11u24.project.tmpl
-workspace_tools/export/ds5_5_lpc1768.cproject.tmpl
-workspace_tools/export/ds5_5_lpc1768.launch.tmpl
-workspace_tools/export/ds5_5_lpc1768.project.tmpl
-workspace_tools/export/exporters.py
-workspace_tools/export/gcc_arm_lpc1768.tmpl
-workspace_tools/export/gccarm.py
-workspace_tools/export/iar.ewp.tmpl
-workspace_tools/export/iar.eww.tmpl
-workspace_tools/export/iar.py
-workspace_tools/export/uvision4.py
-workspace_tools/export/uvision4_kl25z.uvopt.tmpl
-workspace_tools/export/uvision4_kl25z.uvproj.tmpl
-workspace_tools/export/uvision4_lpc1114.uvopt.tmpl
-workspace_tools/export/uvision4_lpc1114.uvproj.tmpl
-workspace_tools/export/uvision4_lpc11c24.uvopt.tmpl
-workspace_tools/export/uvision4_lpc11c24.uvproj.tmpl
-workspace_tools/export/uvision4_lpc11u24.uvopt.tmpl
-workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl
-workspace_tools/export/uvision4_lpc1347.uvopt.tmpl
-workspace_tools/export/uvision4_lpc1347.uvproj.tmpl
-workspace_tools/export/uvision4_lpc1768.uvopt.tmpl
-workspace_tools/export/uvision4_lpc1768.uvproj.tmpl
-workspace_tools/export/uvision4_lpc4088.uvopt.tmpl
-workspace_tools/export/uvision4_lpc4088.uvproj.tmpl
-workspace_tools/export/uvision4_lpc812.uvopt.tmpl
-workspace_tools/export/uvision4_lpc812.uvproj.tmpl
-workspace_tools/host_tests/__init__.py
-workspace_tools/host_tests/echo.py
-workspace_tools/host_tests/host_test.py
-workspace_tools/host_tests/mbedrpc.py
-workspace_tools/host_tests/net_test.py
-workspace_tools/host_tests/rpc.py
-workspace_tools/host_tests/tcpecho_client.py
-workspace_tools/host_tests/tcpecho_server.py
-workspace_tools/host_tests/tcpecho_server_loop.py
-workspace_tools/host_tests/udpecho_client.py
-workspace_tools/host_tests/udpecho_server.py
-workspace_tools/host_tests/example/BroadcastReceive.py
-workspace_tools/host_tests/example/BroadcastSend.py
-workspace_tools/host_tests/example/MulticastReceive.py
-workspace_tools/host_tests/example/MulticastSend.py
-workspace_tools/host_tests/example/TCPEchoClient.py
-workspace_tools/host_tests/example/TCPEchoServer.py
-workspace_tools/host_tests/example/UDPEchoClient.py
-workspace_tools/host_tests/example/UDPEchoServer.py
-workspace_tools/host_tests/example/__init__.py
-workspace_tools/toolchains/__init__.py
-workspace_tools/toolchains/arm.py
-workspace_tools/toolchains/gcc.py
-workspace_tools/toolchains/iar.py

MANIFEST.in

@@ -1,2 +1,3 @@
 graft workspace_tools
-include __init__.py LICENSE
+recursive-exclude workspace_tools *.pyc
+include LICENSE

setup.py

@@ -4,6 +4,10 @@ PyPI package for the Mbed SDK
 """
 
 from distutils.core import setup
+from setuptools import find_packages
+from os.path import isfile, join
+from tempfile import TemporaryFile
+from shutil import copyfileobj
 
 LICENSE = open('LICENSE').read()
 DESCRIPTION = """A set of Python scripts that can be used to compile programs written on top of the `mbed framework`_. It can also be used to export mbed projects to other build systems and IDEs (uVision, IAR, makefiles).
@@ -12,8 +16,21 @@ DESCRIPTION = """A set of Python scripts that can be used to compile programs wr
 OWNER_NAMES = 'emilmont, bogdanm'
 OWNER_EMAILS = 'Emilio.Monti@arm.com, Bogdan.Marinescu@arm.com'
 
+# If private_settings.py exists in workspace_tools, read it in a temporary file
+# so it can be restored later
+private_settings = join('workspace_tools', 'private_settings.py')
+backup = None
+if isfile(private_settings):
+    backup = TemporaryFile()
+    with open(private_settings, "rb") as f:
+        copyfileobj(f, backup)
+
+# Create the correct private_settings.py for the distribution
+with open(private_settings, "wt") as f:
+    f.write("from mbed_settings import *\n")
+
 setup(name='mbed-tools',
-      version='0.1.7',
+      version='0.1.14',
       description='Build and test system for mbed',
       long_description=DESCRIPTION,
       author=OWNER_NAMES,
@@ -21,4 +38,11 @@ setup(name='mbed-tools',
       maintainer=OWNER_NAMES,
       maintainer_email=OWNER_EMAILS,
       url='https://github.com/mbedmicro/mbed',
+      packages=find_packages(),
       license=LICENSE)
+
+# Restore previous private_settings if needed
+if backup:
+    backup.seek(0)
+    with open(private_settings, "wb") as f:
+        copyfileobj(backup, f)

workspace_tools/settings.py

@@ -106,4 +106,4 @@ try:
     # settings file stored in the repository
     from workspace_tools.private_settings import *
 except ImportError:
-    print '[WARNING] Using default settings. Define you settings in the file "workspace_tools/private_settings.py"'
+    print '[WARNING] Using default settings. Define you settings in the file "workspace_tools/private_settings.py" or in "./mbed_settings.py"'