move workspace to tools

Author: mshawcroft

tools/build.py

@@ -27,14 +27,14 @@
 sys.path.insert(0, ROOT)
 
 
-from workspace_tools.toolchains import TOOLCHAINS
-from workspace_tools.targets import TARGET_NAMES, TARGET_MAP
-from workspace_tools.options import get_default_options_parser
-from workspace_tools.build_api import build_mbed_libs, build_lib
-from workspace_tools.build_api import mcu_toolchain_matrix
-from workspace_tools.build_api import static_analysis_scan, static_analysis_scan_lib, static_analysis_scan_library
-from workspace_tools.build_api import print_build_results
-from workspace_tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
+from tools.toolchains import TOOLCHAINS
+from tools.targets import TARGET_NAMES, TARGET_MAP
+from tools.options import get_default_options_parser
+from tools.build_api import build_mbed_libs, build_lib
+from tools.build_api import mcu_toolchain_matrix
+from tools.build_api import static_analysis_scan, static_analysis_scan_lib, static_analysis_scan_library
+from tools.build_api import print_build_results
+from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
 
 if __name__ == '__main__':
     start = time()

tools/build_api.py

@@ -25,11 +25,11 @@
 from os.path import join, exists, basename
 from time import time
 
-from workspace_tools.utils import mkdir, run_cmd, run_cmd_ext, NotSupportedException
-from workspace_tools.paths import MBED_TARGETS_PATH, MBED_LIBRARIES, MBED_API, MBED_HAL, MBED_COMMON
-from workspace_tools.targets import TARGET_NAMES, TARGET_MAP
-from workspace_tools.libraries import Library
-from workspace_tools.toolchains import TOOLCHAIN_CLASSES
+from tools.utils import mkdir, run_cmd, run_cmd_ext, NotSupportedException
+from tools.paths import MBED_TARGETS_PATH, MBED_LIBRARIES, MBED_API, MBED_HAL, MBED_COMMON
+from tools.targets import TARGET_NAMES, TARGET_MAP
+from tools.libraries import Library
+from tools.toolchains import TOOLCHAIN_CLASSES
 from jinja2 import FileSystemLoader
 from jinja2.environment import Environment
 

tools/build_release.py

@@ -25,14 +25,14 @@
 ROOT = abspath(join(dirname(__file__), ".."))
 sys.path.insert(0, ROOT)
 
-from workspace_tools.build_api import build_mbed_libs
-from workspace_tools.build_api import write_build_report
-from workspace_tools.targets import TARGET_MAP
-from workspace_tools.test_exporters import ReportExporter, ResultExporterType
-from workspace_tools.test_api import SingleTestRunner
-from workspace_tools.test_api import singletest_in_cli_mode
-from workspace_tools.paths import TEST_DIR
-from workspace_tools.tests import TEST_MAP
+from tools.build_api import build_mbed_libs
+from tools.build_api import write_build_report
+from tools.targets import TARGET_MAP
+from tools.test_exporters import ReportExporter, ResultExporterType
+from tools.test_api import SingleTestRunner
+from tools.test_api import singletest_in_cli_mode
+from tools.paths import TEST_DIR
+from tools.tests import TEST_MAP
 
 OFFICIAL_MBED_LIBRARY_BUILD = (
     ('LPC11U24',     ('ARM', 'uARM', 'GCC_ARM', 'IAR')),

tools/build_travis.py

@@ -137,7 +137,7 @@ def run_builds(dry_run):
         toolchain_list = build["toolchains"]
         if type(toolchain_list) != type([]): toolchain_list = [toolchain_list]
         for toolchain in toolchain_list:
-            cmdline = "python workspace_tools/build.py -m %s -t %s -j 4 -c --silent "% (build["target"], toolchain)
+            cmdline = "python tools/build.py -m %s -t %s -j 4 -c --silent "% (build["target"], toolchain)
             libs = build.get("libs", [])
             if libs:
                 cmdline = cmdline + " ".join(["--" + l for l in libs])
@@ -161,14 +161,14 @@ def run_test_linking(dry_run):
             for test_lib in tests:
                 test_names = tests[test_lib]
                 test_lib_switch = "--" + test_lib if test_lib else ""
-                cmdline = "python workspace_tools/make.py -m %s -t %s -c --silent %s -n %s " % (link["target"], toolchain, test_lib_switch, ",".join(test_names))
+                cmdline = "python tools/make.py -m %s -t %s -c --silent %s -n %s " % (link["target"], toolchain, test_lib_switch, ",".join(test_names))
                 print "Executing: " + cmdline
                 if not dry_run:
                     if os.system(cmdline) != 0:
                         sys.exit(1)
 
 def run_test_testsuite(dry_run):
-    cmdline = "python workspace_tools/singletest.py --version"
+    cmdline = "python tools/singletest.py --version"
     print "Executing: " + cmdline
     if not dry_run:
         if os.system(cmdline) != 0:

tools/data/support.py

@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from workspace_tools.targets import TARGETS
+from tools.targets import TARGETS
 
 DEFAULT_SUPPORT = {}
 CORTEX_ARM_SUPPORT = {}

tools/dev/rpc_classes.py

@@ -17,7 +17,7 @@
 from os.path import join
 from jinja2 import Template
 
-from workspace_tools.paths import TOOLS_DATA, MBED_RPC
+from tools.paths import TOOLS_DATA, MBED_RPC
 
 RPC_TEMPLATES_PATH = join(TOOLS_DATA, "rpc")
 

tools/export/__init__.py

@@ -19,10 +19,10 @@
 from shutil import copytree, rmtree, copy
 import yaml
 
-from workspace_tools.utils import mkdir
-from workspace_tools.export import uvision4, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio, sw4stm32
-from workspace_tools.export.exporters import zip_working_directory_and_clean_up, OldLibrariesException
-from workspace_tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
+from tools.utils import mkdir
+from tools.export import uvision4, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio, sw4stm32
+from tools.export.exporters import zip_working_directory_and_clean_up, OldLibrariesException
+from tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
 
 from project_generator_definitions.definitions import ProGenDef
 

tools/export/emblocks.py

@@ -16,7 +16,7 @@
 """
 from exporters import Exporter
 from os.path import splitext, basename
-from workspace_tools.targets import TARGETS
+from tools.targets import TARGETS
 
 # filter all the GCC_ARM targets out of the target list
 gccTargets = []

tools/export/exporters.py

@@ -8,9 +8,9 @@
 from contextlib import closing
 from zipfile import ZipFile, ZIP_DEFLATED
 
-from workspace_tools.utils import mkdir
-from workspace_tools.toolchains import TOOLCHAIN_CLASSES
-from workspace_tools.targets import TARGET_MAP
+from tools.utils import mkdir
+from tools.toolchains import TOOLCHAIN_CLASSES
+from tools.targets import TARGET_MAP
 
 from project_generator.generate import Generator
 from project_generator.project import Project

tools/export/iar.py

@@ -18,8 +18,8 @@
 import os
 from project_generator_definitions.definitions import ProGenDef
 
-from workspace_tools.export.exporters import Exporter
-from workspace_tools.targets import TARGET_MAP, TARGET_NAMES
+from tools.export.exporters import Exporter
+from tools.targets import TARGET_MAP, TARGET_NAMES
 
 # If you wish to add a new target, add it to project_generator_definitions, and then
 # define progen_target name in the target class (`` self.progen_target = 'my_target_name' ``)