diff --git a/workspace_tools/.mbedignore b/tools/.mbedignore similarity index 100% rename from workspace_tools/.mbedignore rename to tools/.mbedignore diff --git a/workspace_tools/__init__.py b/tools/__init__.py similarity index 100% rename from workspace_tools/__init__.py rename to tools/__init__.py diff --git a/workspace_tools/bootloaders/MTS_DRAGONFLY_F411RE/bootloader.bin b/tools/bootloaders/MTS_DRAGONFLY_F411RE/bootloader.bin old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/bootloaders/MTS_DRAGONFLY_F411RE/bootloader.bin rename to tools/bootloaders/MTS_DRAGONFLY_F411RE/bootloader.bin diff --git a/workspace_tools/bootloaders/MTS_MDOT_F411RE/bootloader.bin b/tools/bootloaders/MTS_MDOT_F411RE/bootloader.bin old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/bootloaders/MTS_MDOT_F411RE/bootloader.bin rename to tools/bootloaders/MTS_MDOT_F411RE/bootloader.bin diff --git a/workspace_tools/build.py b/tools/build.py old mode 100755 new mode 100644 similarity index 94% rename from workspace_tools/build.py rename to tools/build.py index f61bbfc9e7..8ae18c042d --- a/workspace_tools/build.py +++ b/tools/build.py @@ -27,14 +27,14 @@ ROOT = abspath(join(dirname(__file__), "..")) 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() diff --git a/workspace_tools/build_api.py b/tools/build_api.py similarity index 98% rename from workspace_tools/build_api.py rename to tools/build_api.py index 3dca0adbae..6a19eb0483 100644 --- a/workspace_tools/build_api.py +++ b/tools/build_api.py @@ -25,11 +25,11 @@ from shutil import rmtree 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 diff --git a/workspace_tools/build_release.py b/tools/build_release.py similarity index 96% rename from workspace_tools/build_release.py rename to tools/build_release.py index ef28edba54..d9d3683a17 100644 --- a/workspace_tools/build_release.py +++ b/tools/build_release.py @@ -25,14 +25,14 @@ import json 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, TARGET_NAMES -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, TARGET_NAMES +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')), diff --git a/workspace_tools/build_travis.py b/tools/build_travis.py similarity index 100% rename from workspace_tools/build_travis.py rename to tools/build_travis.py diff --git a/workspace_tools/buildbot/master.cfg b/tools/buildbot/master.cfg similarity index 100% rename from workspace_tools/buildbot/master.cfg rename to tools/buildbot/master.cfg diff --git a/workspace_tools/ci_templates/library_build/build_report.html b/tools/ci_templates/library_build/build_report.html similarity index 100% rename from workspace_tools/ci_templates/library_build/build_report.html rename to tools/ci_templates/library_build/build_report.html diff --git a/workspace_tools/ci_templates/library_build/build_report_table.html b/tools/ci_templates/library_build/build_report_table.html similarity index 100% rename from workspace_tools/ci_templates/library_build/build_report_table.html rename to tools/ci_templates/library_build/build_report_table.html diff --git a/workspace_tools/ci_templates/library_build/report.html b/tools/ci_templates/library_build/report.html similarity index 100% rename from workspace_tools/ci_templates/library_build/report.html rename to tools/ci_templates/library_build/report.html diff --git a/workspace_tools/ci_templates/scripts.js b/tools/ci_templates/scripts.js similarity index 100% rename from workspace_tools/ci_templates/scripts.js rename to tools/ci_templates/scripts.js diff --git a/workspace_tools/ci_templates/tests_build/build_report.html b/tools/ci_templates/tests_build/build_report.html similarity index 100% rename from workspace_tools/ci_templates/tests_build/build_report.html rename to tools/ci_templates/tests_build/build_report.html diff --git a/workspace_tools/ci_templates/tests_build/build_report_table.html b/tools/ci_templates/tests_build/build_report_table.html similarity index 100% rename from workspace_tools/ci_templates/tests_build/build_report_table.html rename to tools/ci_templates/tests_build/build_report_table.html diff --git a/workspace_tools/ci_templates/tests_build/report.html b/tools/ci_templates/tests_build/report.html similarity index 100% rename from workspace_tools/ci_templates/tests_build/report.html rename to tools/ci_templates/tests_build/report.html diff --git a/workspace_tools/compliance/__init__.py b/tools/compliance/__init__.py similarity index 100% rename from workspace_tools/compliance/__init__.py rename to tools/compliance/__init__.py diff --git a/workspace_tools/compliance/ioper_base.py b/tools/compliance/ioper_base.py similarity index 100% rename from workspace_tools/compliance/ioper_base.py rename to tools/compliance/ioper_base.py diff --git a/workspace_tools/compliance/ioper_runner.py b/tools/compliance/ioper_runner.py similarity index 100% rename from workspace_tools/compliance/ioper_runner.py rename to tools/compliance/ioper_runner.py diff --git a/workspace_tools/compliance/ioper_test_fs.py b/tools/compliance/ioper_test_fs.py similarity index 100% rename from workspace_tools/compliance/ioper_test_fs.py rename to tools/compliance/ioper_test_fs.py diff --git a/workspace_tools/compliance/ioper_test_target_id.py b/tools/compliance/ioper_test_target_id.py similarity index 100% rename from workspace_tools/compliance/ioper_test_target_id.py rename to tools/compliance/ioper_test_target_id.py diff --git a/workspace_tools/data/__init__.py b/tools/data/__init__.py similarity index 100% rename from workspace_tools/data/__init__.py rename to tools/data/__init__.py diff --git a/workspace_tools/data/rpc/RPCClasses.h b/tools/data/rpc/RPCClasses.h similarity index 100% rename from workspace_tools/data/rpc/RPCClasses.h rename to tools/data/rpc/RPCClasses.h diff --git a/workspace_tools/data/rpc/class.cpp b/tools/data/rpc/class.cpp similarity index 100% rename from workspace_tools/data/rpc/class.cpp rename to tools/data/rpc/class.cpp diff --git a/workspace_tools/data/support.py b/tools/data/support.py similarity index 95% rename from workspace_tools/data/support.py rename to tools/data/support.py index b47380f4d9..7af37746f7 100644 --- a/workspace_tools/data/support.py +++ b/tools/data/support.py @@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 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 = {} diff --git a/workspace_tools/dev/__init__.py b/tools/dev/__init__.py similarity index 100% rename from workspace_tools/dev/__init__.py rename to tools/dev/__init__.py diff --git a/workspace_tools/dev/dsp_fir.py b/tools/dev/dsp_fir.py similarity index 100% rename from workspace_tools/dev/dsp_fir.py rename to tools/dev/dsp_fir.py diff --git a/workspace_tools/dev/intel_hex_utils.py b/tools/dev/intel_hex_utils.py similarity index 100% rename from workspace_tools/dev/intel_hex_utils.py rename to tools/dev/intel_hex_utils.py diff --git a/workspace_tools/dev/rpc_classes.py b/tools/dev/rpc_classes.py similarity index 98% rename from workspace_tools/dev/rpc_classes.py rename to tools/dev/rpc_classes.py index f082f3b9da..46fd902b2f 100644 --- a/workspace_tools/dev/rpc_classes.py +++ b/tools/dev/rpc_classes.py @@ -17,7 +17,7 @@ limitations under the License. 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") diff --git a/workspace_tools/dev/syms.py b/tools/dev/syms.py similarity index 100% rename from workspace_tools/dev/syms.py rename to tools/dev/syms.py diff --git a/workspace_tools/export/.hgignore b/tools/export/.hgignore old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/export/.hgignore rename to tools/export/.hgignore diff --git a/workspace_tools/export/README.md b/tools/export/README.md similarity index 100% rename from workspace_tools/export/README.md rename to tools/export/README.md diff --git a/workspace_tools/export/__init__.py b/tools/export/__init__.py old mode 100755 new mode 100644 similarity index 95% rename from workspace_tools/export/__init__.py rename to tools/export/__init__.py index 1b4cd197ba..c1db817779 --- a/workspace_tools/export/__init__.py +++ b/tools/export/__init__.py @@ -19,10 +19,10 @@ from os.path import join, exists, basename from shutil import copytree, rmtree, copy import yaml -from workspace_tools.utils import mkdir -from workspace_tools.export import uvision4, uvision5, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio, sw4stm32, e2studio -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, uvision5, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio, sw4stm32, e2studio +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 diff --git a/workspace_tools/export/atmelstudio.py b/tools/export/atmelstudio.py similarity index 100% rename from workspace_tools/export/atmelstudio.py rename to tools/export/atmelstudio.py diff --git a/workspace_tools/export/atmelstudio6_2.atsln.tmpl b/tools/export/atmelstudio6_2.atsln.tmpl similarity index 100% rename from workspace_tools/export/atmelstudio6_2.atsln.tmpl rename to tools/export/atmelstudio6_2.atsln.tmpl diff --git a/workspace_tools/export/atmelstudio6_2.cppproj.tmpl b/tools/export/atmelstudio6_2.cppproj.tmpl similarity index 100% rename from workspace_tools/export/atmelstudio6_2.cppproj.tmpl rename to tools/export/atmelstudio6_2.cppproj.tmpl diff --git a/workspace_tools/export/codered.py b/tools/export/codered.py old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/export/codered.py rename to tools/export/codered.py diff --git a/workspace_tools/export/codered_arch_pro_cproject.tmpl b/tools/export/codered_arch_pro_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_arch_pro_cproject.tmpl rename to tools/export/codered_arch_pro_cproject.tmpl diff --git a/workspace_tools/export/codered_arch_pro_project.tmpl b/tools/export/codered_arch_pro_project.tmpl similarity index 100% rename from workspace_tools/export/codered_arch_pro_project.tmpl rename to tools/export/codered_arch_pro_project.tmpl diff --git a/workspace_tools/export/codered_cproject_common.tmpl b/tools/export/codered_cproject_common.tmpl similarity index 100% rename from workspace_tools/export/codered_cproject_common.tmpl rename to tools/export/codered_cproject_common.tmpl diff --git a/workspace_tools/export/codered_cproject_cortexm0_common.tmpl b/tools/export/codered_cproject_cortexm0_common.tmpl similarity index 100% rename from workspace_tools/export/codered_cproject_cortexm0_common.tmpl rename to tools/export/codered_cproject_cortexm0_common.tmpl diff --git a/workspace_tools/export/codered_cproject_cortexm3_common.tmpl b/tools/export/codered_cproject_cortexm3_common.tmpl similarity index 100% rename from workspace_tools/export/codered_cproject_cortexm3_common.tmpl rename to tools/export/codered_cproject_cortexm3_common.tmpl diff --git a/workspace_tools/export/codered_lpc1114_cproject.tmpl b/tools/export/codered_lpc1114_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc1114_cproject.tmpl rename to tools/export/codered_lpc1114_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc1114_project.tmpl b/tools/export/codered_lpc1114_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc1114_project.tmpl rename to tools/export/codered_lpc1114_project.tmpl diff --git a/workspace_tools/export/codered_lpc11u35_401_cproject.tmpl b/tools/export/codered_lpc11u35_401_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u35_401_cproject.tmpl rename to tools/export/codered_lpc11u35_401_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc11u35_401_project.tmpl b/tools/export/codered_lpc11u35_401_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u35_401_project.tmpl rename to tools/export/codered_lpc11u35_401_project.tmpl diff --git a/workspace_tools/export/codered_lpc11u35_501_cproject.tmpl b/tools/export/codered_lpc11u35_501_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u35_501_cproject.tmpl rename to tools/export/codered_lpc11u35_501_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc11u35_501_project.tmpl b/tools/export/codered_lpc11u35_501_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u35_501_project.tmpl rename to tools/export/codered_lpc11u35_501_project.tmpl diff --git a/workspace_tools/export/codered_lpc11u37h_401_cproject.tmpl b/tools/export/codered_lpc11u37h_401_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u37h_401_cproject.tmpl rename to tools/export/codered_lpc11u37h_401_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc11u37h_401_project.tmpl b/tools/export/codered_lpc11u37h_401_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u37h_401_project.tmpl rename to tools/export/codered_lpc11u37h_401_project.tmpl diff --git a/workspace_tools/export/codered_lpc11u68_cproject.tmpl b/tools/export/codered_lpc11u68_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u68_cproject.tmpl rename to tools/export/codered_lpc11u68_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc11u68_project.tmpl b/tools/export/codered_lpc11u68_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc11u68_project.tmpl rename to tools/export/codered_lpc11u68_project.tmpl diff --git a/workspace_tools/export/codered_lpc1549_cproject.tmpl b/tools/export/codered_lpc1549_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc1549_cproject.tmpl rename to tools/export/codered_lpc1549_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc1549_project.tmpl b/tools/export/codered_lpc1549_project.tmpl old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/export/codered_lpc1549_project.tmpl rename to tools/export/codered_lpc1549_project.tmpl diff --git a/workspace_tools/export/codered_lpc1768_cproject.tmpl b/tools/export/codered_lpc1768_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc1768_cproject.tmpl rename to tools/export/codered_lpc1768_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc1768_project.tmpl b/tools/export/codered_lpc1768_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc1768_project.tmpl rename to tools/export/codered_lpc1768_project.tmpl diff --git a/workspace_tools/export/codered_lpc4088_cproject.tmpl b/tools/export/codered_lpc4088_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc4088_cproject.tmpl rename to tools/export/codered_lpc4088_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc4088_dm_cproject.tmpl b/tools/export/codered_lpc4088_dm_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc4088_dm_cproject.tmpl rename to tools/export/codered_lpc4088_dm_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc4088_dm_project.tmpl b/tools/export/codered_lpc4088_dm_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc4088_dm_project.tmpl rename to tools/export/codered_lpc4088_dm_project.tmpl diff --git a/workspace_tools/export/codered_lpc4088_project.tmpl b/tools/export/codered_lpc4088_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc4088_project.tmpl rename to tools/export/codered_lpc4088_project.tmpl diff --git a/workspace_tools/export/codered_lpc4330_m4_cproject.tmpl b/tools/export/codered_lpc4330_m4_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc4330_m4_cproject.tmpl rename to tools/export/codered_lpc4330_m4_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc4330_m4_project.tmpl b/tools/export/codered_lpc4330_m4_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc4330_m4_project.tmpl rename to tools/export/codered_lpc4330_m4_project.tmpl diff --git a/workspace_tools/export/codered_lpc824_cproject.tmpl b/tools/export/codered_lpc824_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc824_cproject.tmpl rename to tools/export/codered_lpc824_cproject.tmpl diff --git a/workspace_tools/export/codered_lpc824_project.tmpl b/tools/export/codered_lpc824_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpc824_project.tmpl rename to tools/export/codered_lpc824_project.tmpl diff --git a/workspace_tools/export/codered_lpccappuccino_cproject.tmpl b/tools/export/codered_lpccappuccino_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_lpccappuccino_cproject.tmpl rename to tools/export/codered_lpccappuccino_cproject.tmpl diff --git a/workspace_tools/export/codered_lpccappuccino_project.tmpl b/tools/export/codered_lpccappuccino_project.tmpl similarity index 100% rename from workspace_tools/export/codered_lpccappuccino_project.tmpl rename to tools/export/codered_lpccappuccino_project.tmpl diff --git a/workspace_tools/export/codered_project_common.tmpl b/tools/export/codered_project_common.tmpl similarity index 100% rename from workspace_tools/export/codered_project_common.tmpl rename to tools/export/codered_project_common.tmpl diff --git a/workspace_tools/export/codered_ublox_c027_cproject.tmpl b/tools/export/codered_ublox_c027_cproject.tmpl similarity index 100% rename from workspace_tools/export/codered_ublox_c027_cproject.tmpl rename to tools/export/codered_ublox_c027_cproject.tmpl diff --git a/workspace_tools/export/codered_ublox_c027_project.tmpl b/tools/export/codered_ublox_c027_project.tmpl similarity index 100% rename from workspace_tools/export/codered_ublox_c027_project.tmpl rename to tools/export/codered_ublox_c027_project.tmpl diff --git a/workspace_tools/export/coide.py b/tools/export/coide.py old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/export/coide.py rename to tools/export/coide.py diff --git a/workspace_tools/export/coide_arch_max.coproj.tmpl b/tools/export/coide_arch_max.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_arch_max.coproj.tmpl rename to tools/export/coide_arch_max.coproj.tmpl diff --git a/workspace_tools/export/coide_arch_pro.coproj.tmpl b/tools/export/coide_arch_pro.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_arch_pro.coproj.tmpl rename to tools/export/coide_arch_pro.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f051r8.coproj.tmpl b/tools/export/coide_disco_f051r8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f051r8.coproj.tmpl rename to tools/export/coide_disco_f051r8.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f100rb.coproj.tmpl b/tools/export/coide_disco_f100rb.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f100rb.coproj.tmpl rename to tools/export/coide_disco_f100rb.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f303vc.coproj.tmpl b/tools/export/coide_disco_f303vc.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f303vc.coproj.tmpl rename to tools/export/coide_disco_f303vc.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f334c8.coproj.tmpl b/tools/export/coide_disco_f334c8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f334c8.coproj.tmpl rename to tools/export/coide_disco_f334c8.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f401vc.coproj.tmpl b/tools/export/coide_disco_f401vc.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f401vc.coproj.tmpl rename to tools/export/coide_disco_f401vc.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f407vg.coproj.tmpl b/tools/export/coide_disco_f407vg.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f407vg.coproj.tmpl rename to tools/export/coide_disco_f407vg.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_f429zi.coproj.tmpl b/tools/export/coide_disco_f429zi.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_f429zi.coproj.tmpl rename to tools/export/coide_disco_f429zi.coproj.tmpl diff --git a/workspace_tools/export/coide_disco_l053c8.coproj.tmpl b/tools/export/coide_disco_l053c8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_disco_l053c8.coproj.tmpl rename to tools/export/coide_disco_l053c8.coproj.tmpl diff --git a/workspace_tools/export/coide_kl05z.coproj.tmpl b/tools/export/coide_kl05z.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_kl05z.coproj.tmpl rename to tools/export/coide_kl05z.coproj.tmpl diff --git a/workspace_tools/export/coide_kl25z.coproj.tmpl b/tools/export/coide_kl25z.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_kl25z.coproj.tmpl rename to tools/export/coide_kl25z.coproj.tmpl diff --git a/workspace_tools/export/coide_lpc1768.coproj.tmpl b/tools/export/coide_lpc1768.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_lpc1768.coproj.tmpl rename to tools/export/coide_lpc1768.coproj.tmpl diff --git a/workspace_tools/export/coide_mote_l152rc.coproj.tmpl b/tools/export/coide_mote_l152rc.coproj.tmpl old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/export/coide_mote_l152rc.coproj.tmpl rename to tools/export/coide_mote_l152rc.coproj.tmpl diff --git a/workspace_tools/export/coide_mts_mdot_f405rg.coproj.tmpl b/tools/export/coide_mts_mdot_f405rg.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_mts_mdot_f405rg.coproj.tmpl rename to tools/export/coide_mts_mdot_f405rg.coproj.tmpl diff --git a/workspace_tools/export/coide_mts_mdot_f411re.coproj.tmpl b/tools/export/coide_mts_mdot_f411re.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_mts_mdot_f411re.coproj.tmpl rename to tools/export/coide_mts_mdot_f411re.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f030r8.coproj.tmpl b/tools/export/coide_nucleo_f030r8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f030r8.coproj.tmpl rename to tools/export/coide_nucleo_f030r8.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f042k6.coproj.tmpl b/tools/export/coide_nucleo_f042k6.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f042k6.coproj.tmpl rename to tools/export/coide_nucleo_f042k6.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f070rb.coproj.tmpl b/tools/export/coide_nucleo_f070rb.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f070rb.coproj.tmpl rename to tools/export/coide_nucleo_f070rb.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f072rb.coproj.tmpl b/tools/export/coide_nucleo_f072rb.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f072rb.coproj.tmpl rename to tools/export/coide_nucleo_f072rb.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f091rc.coproj.tmpl b/tools/export/coide_nucleo_f091rc.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f091rc.coproj.tmpl rename to tools/export/coide_nucleo_f091rc.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f103rb.coproj.tmpl b/tools/export/coide_nucleo_f103rb.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f103rb.coproj.tmpl rename to tools/export/coide_nucleo_f103rb.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f302r8.coproj.tmpl b/tools/export/coide_nucleo_f302r8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f302r8.coproj.tmpl rename to tools/export/coide_nucleo_f302r8.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f303re.coproj.tmpl b/tools/export/coide_nucleo_f303re.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f303re.coproj.tmpl rename to tools/export/coide_nucleo_f303re.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f334r8.coproj.tmpl b/tools/export/coide_nucleo_f334r8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f334r8.coproj.tmpl rename to tools/export/coide_nucleo_f334r8.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f401re.coproj.tmpl b/tools/export/coide_nucleo_f401re.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f401re.coproj.tmpl rename to tools/export/coide_nucleo_f401re.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f410rb.coproj.tmpl b/tools/export/coide_nucleo_f410rb.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f410rb.coproj.tmpl rename to tools/export/coide_nucleo_f410rb.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f411re.coproj.tmpl b/tools/export/coide_nucleo_f411re.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f411re.coproj.tmpl rename to tools/export/coide_nucleo_f411re.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_f446re.coproj.tmpl b/tools/export/coide_nucleo_f446re.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_f446re.coproj.tmpl rename to tools/export/coide_nucleo_f446re.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_l053r8.coproj.tmpl b/tools/export/coide_nucleo_l053r8.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_l053r8.coproj.tmpl rename to tools/export/coide_nucleo_l053r8.coproj.tmpl diff --git a/workspace_tools/export/coide_nucleo_l152re.coproj.tmpl b/tools/export/coide_nucleo_l152re.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nucleo_l152re.coproj.tmpl rename to tools/export/coide_nucleo_l152re.coproj.tmpl diff --git a/workspace_tools/export/coide_nz32_sc151.coproj.tmpl b/tools/export/coide_nz32_sc151.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_nz32_sc151.coproj.tmpl rename to tools/export/coide_nz32_sc151.coproj.tmpl diff --git a/workspace_tools/export/coide_ublox_c027.coproj.tmpl b/tools/export/coide_ublox_c027.coproj.tmpl similarity index 100% rename from workspace_tools/export/coide_ublox_c027.coproj.tmpl rename to tools/export/coide_ublox_c027.coproj.tmpl diff --git a/workspace_tools/export/ds5_5.py b/tools/export/ds5_5.py similarity index 100% rename from workspace_tools/export/ds5_5.py rename to tools/export/ds5_5.py diff --git a/workspace_tools/export/ds5_5_arch_pro.cproject.tmpl b/tools/export/ds5_5_arch_pro.cproject.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_arch_pro.cproject.tmpl rename to tools/export/ds5_5_arch_pro.cproject.tmpl diff --git a/workspace_tools/export/ds5_5_arch_pro.launch.tmpl b/tools/export/ds5_5_arch_pro.launch.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_arch_pro.launch.tmpl rename to tools/export/ds5_5_arch_pro.launch.tmpl diff --git a/workspace_tools/export/ds5_5_arch_pro.project.tmpl b/tools/export/ds5_5_arch_pro.project.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_arch_pro.project.tmpl rename to tools/export/ds5_5_arch_pro.project.tmpl diff --git a/workspace_tools/export/ds5_5_lpc11u24.cproject.tmpl b/tools/export/ds5_5_lpc11u24.cproject.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc11u24.cproject.tmpl rename to tools/export/ds5_5_lpc11u24.cproject.tmpl diff --git a/workspace_tools/export/ds5_5_lpc11u24.launch.tmpl b/tools/export/ds5_5_lpc11u24.launch.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc11u24.launch.tmpl rename to tools/export/ds5_5_lpc11u24.launch.tmpl diff --git a/workspace_tools/export/ds5_5_lpc11u24.project.tmpl b/tools/export/ds5_5_lpc11u24.project.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc11u24.project.tmpl rename to tools/export/ds5_5_lpc11u24.project.tmpl diff --git a/workspace_tools/export/ds5_5_lpc1768.cproject.tmpl b/tools/export/ds5_5_lpc1768.cproject.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc1768.cproject.tmpl rename to tools/export/ds5_5_lpc1768.cproject.tmpl diff --git a/workspace_tools/export/ds5_5_lpc1768.launch.tmpl b/tools/export/ds5_5_lpc1768.launch.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc1768.launch.tmpl rename to tools/export/ds5_5_lpc1768.launch.tmpl diff --git a/workspace_tools/export/ds5_5_lpc1768.project.tmpl b/tools/export/ds5_5_lpc1768.project.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc1768.project.tmpl rename to tools/export/ds5_5_lpc1768.project.tmpl diff --git a/workspace_tools/export/ds5_5_lpc812.cproject.tmpl b/tools/export/ds5_5_lpc812.cproject.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc812.cproject.tmpl rename to tools/export/ds5_5_lpc812.cproject.tmpl diff --git a/workspace_tools/export/ds5_5_lpc812.launch.tmpl b/tools/export/ds5_5_lpc812.launch.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc812.launch.tmpl rename to tools/export/ds5_5_lpc812.launch.tmpl diff --git a/workspace_tools/export/ds5_5_lpc812.project.tmpl b/tools/export/ds5_5_lpc812.project.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_lpc812.project.tmpl rename to tools/export/ds5_5_lpc812.project.tmpl diff --git a/workspace_tools/export/ds5_5_rz_a1h.cproject.tmpl b/tools/export/ds5_5_rz_a1h.cproject.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_rz_a1h.cproject.tmpl rename to tools/export/ds5_5_rz_a1h.cproject.tmpl diff --git a/workspace_tools/export/ds5_5_rz_a1h.launch.tmpl b/tools/export/ds5_5_rz_a1h.launch.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_rz_a1h.launch.tmpl rename to tools/export/ds5_5_rz_a1h.launch.tmpl diff --git a/workspace_tools/export/ds5_5_rz_a1h.project.tmpl b/tools/export/ds5_5_rz_a1h.project.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_rz_a1h.project.tmpl rename to tools/export/ds5_5_rz_a1h.project.tmpl diff --git a/workspace_tools/export/ds5_5_ublox_c027.cproject.tmpl b/tools/export/ds5_5_ublox_c027.cproject.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_ublox_c027.cproject.tmpl rename to tools/export/ds5_5_ublox_c027.cproject.tmpl diff --git a/workspace_tools/export/ds5_5_ublox_c027.launch.tmpl b/tools/export/ds5_5_ublox_c027.launch.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_ublox_c027.launch.tmpl rename to tools/export/ds5_5_ublox_c027.launch.tmpl diff --git a/workspace_tools/export/ds5_5_ublox_c027.project.tmpl b/tools/export/ds5_5_ublox_c027.project.tmpl similarity index 100% rename from workspace_tools/export/ds5_5_ublox_c027.project.tmpl rename to tools/export/ds5_5_ublox_c027.project.tmpl diff --git a/workspace_tools/export/e2studio.py b/tools/export/e2studio.py similarity index 100% rename from workspace_tools/export/e2studio.py rename to tools/export/e2studio.py diff --git a/workspace_tools/export/e2studio_launch.tmpl b/tools/export/e2studio_launch.tmpl similarity index 100% rename from workspace_tools/export/e2studio_launch.tmpl rename to tools/export/e2studio_launch.tmpl diff --git a/workspace_tools/export/e2studio_rz_a1h_cproject.tmpl b/tools/export/e2studio_rz_a1h_cproject.tmpl similarity index 100% rename from workspace_tools/export/e2studio_rz_a1h_cproject.tmpl rename to tools/export/e2studio_rz_a1h_cproject.tmpl diff --git a/workspace_tools/export/e2studio_rz_a1h_gdbinit.tmpl b/tools/export/e2studio_rz_a1h_gdbinit.tmpl similarity index 100% rename from workspace_tools/export/e2studio_rz_a1h_gdbinit.tmpl rename to tools/export/e2studio_rz_a1h_gdbinit.tmpl diff --git a/workspace_tools/export/e2studio_rz_a1h_project.tmpl b/tools/export/e2studio_rz_a1h_project.tmpl similarity index 100% rename from workspace_tools/export/e2studio_rz_a1h_project.tmpl rename to tools/export/e2studio_rz_a1h_project.tmpl diff --git a/workspace_tools/export/emblocks.eix.tmpl b/tools/export/emblocks.eix.tmpl similarity index 100% rename from workspace_tools/export/emblocks.eix.tmpl rename to tools/export/emblocks.eix.tmpl diff --git a/workspace_tools/export/emblocks.py b/tools/export/emblocks.py similarity index 98% rename from workspace_tools/export/emblocks.py rename to tools/export/emblocks.py index 88a14d3354..d964b3dc96 100644 --- a/workspace_tools/export/emblocks.py +++ b/tools/export/emblocks.py @@ -16,7 +16,7 @@ limitations under the License. """ 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 = [] diff --git a/workspace_tools/export/exporters.py b/tools/export/exporters.py similarity index 97% rename from workspace_tools/export/exporters.py rename to tools/export/exporters.py index 181f753bd9..42e1f7fd45 100644 --- a/workspace_tools/export/exporters.py +++ b/tools/export/exporters.py @@ -8,9 +8,9 @@ from jinja2.environment import Environment 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 diff --git a/workspace_tools/export/gcc_arm_arch_ble.tmpl b/tools/export/gcc_arm_arch_ble.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_arch_ble.tmpl rename to tools/export/gcc_arm_arch_ble.tmpl diff --git a/workspace_tools/export/gcc_arm_arch_max.tmpl b/tools/export/gcc_arm_arch_max.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_arch_max.tmpl rename to tools/export/gcc_arm_arch_max.tmpl diff --git a/workspace_tools/export/gcc_arm_arch_pro.tmpl b/tools/export/gcc_arm_arch_pro.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_arch_pro.tmpl rename to tools/export/gcc_arm_arch_pro.tmpl diff --git a/workspace_tools/export/gcc_arm_b96b_f446ve.tmpl b/tools/export/gcc_arm_b96b_f446ve.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_b96b_f446ve.tmpl rename to tools/export/gcc_arm_b96b_f446ve.tmpl diff --git a/workspace_tools/export/gcc_arm_common.tmpl b/tools/export/gcc_arm_common.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_common.tmpl rename to tools/export/gcc_arm_common.tmpl diff --git a/workspace_tools/export/gcc_arm_delta_dfcm_nnn40.tmpl b/tools/export/gcc_arm_delta_dfcm_nnn40.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_delta_dfcm_nnn40.tmpl rename to tools/export/gcc_arm_delta_dfcm_nnn40.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f051r8.tmpl b/tools/export/gcc_arm_disco_f051r8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f051r8.tmpl rename to tools/export/gcc_arm_disco_f051r8.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f100rb.tmpl b/tools/export/gcc_arm_disco_f100rb.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f100rb.tmpl rename to tools/export/gcc_arm_disco_f100rb.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f303vc.tmpl b/tools/export/gcc_arm_disco_f303vc.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f303vc.tmpl rename to tools/export/gcc_arm_disco_f303vc.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f334c8.tmpl b/tools/export/gcc_arm_disco_f334c8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f334c8.tmpl rename to tools/export/gcc_arm_disco_f334c8.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f401vc.tmpl b/tools/export/gcc_arm_disco_f401vc.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f401vc.tmpl rename to tools/export/gcc_arm_disco_f401vc.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f407vg.tmpl b/tools/export/gcc_arm_disco_f407vg.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f407vg.tmpl rename to tools/export/gcc_arm_disco_f407vg.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f429zi.tmpl b/tools/export/gcc_arm_disco_f429zi.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f429zi.tmpl rename to tools/export/gcc_arm_disco_f429zi.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f469ni.tmpl b/tools/export/gcc_arm_disco_f469ni.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f469ni.tmpl rename to tools/export/gcc_arm_disco_f469ni.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_f746ng.tmpl b/tools/export/gcc_arm_disco_f746ng.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_f746ng.tmpl rename to tools/export/gcc_arm_disco_f746ng.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_l053c8.tmpl b/tools/export/gcc_arm_disco_l053c8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_l053c8.tmpl rename to tools/export/gcc_arm_disco_l053c8.tmpl diff --git a/workspace_tools/export/gcc_arm_disco_l476vg.tmpl b/tools/export/gcc_arm_disco_l476vg.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_disco_l476vg.tmpl rename to tools/export/gcc_arm_disco_l476vg.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32_common.tmpl b/tools/export/gcc_arm_efm32_common.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32_common.tmpl rename to tools/export/gcc_arm_efm32_common.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32gg_stk3700.tmpl b/tools/export/gcc_arm_efm32gg_stk3700.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32gg_stk3700.tmpl rename to tools/export/gcc_arm_efm32gg_stk3700.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32hg_stk3400.tmpl b/tools/export/gcc_arm_efm32hg_stk3400.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32hg_stk3400.tmpl rename to tools/export/gcc_arm_efm32hg_stk3400.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32lg_stk3600.tmpl b/tools/export/gcc_arm_efm32lg_stk3600.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32lg_stk3600.tmpl rename to tools/export/gcc_arm_efm32lg_stk3600.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32pg_stk3401.tmpl b/tools/export/gcc_arm_efm32pg_stk3401.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32pg_stk3401.tmpl rename to tools/export/gcc_arm_efm32pg_stk3401.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32wg_stk3800.tmpl b/tools/export/gcc_arm_efm32wg_stk3800.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32wg_stk3800.tmpl rename to tools/export/gcc_arm_efm32wg_stk3800.tmpl diff --git a/workspace_tools/export/gcc_arm_efm32zg_stk3200.tmpl b/tools/export/gcc_arm_efm32zg_stk3200.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_efm32zg_stk3200.tmpl rename to tools/export/gcc_arm_efm32zg_stk3200.tmpl diff --git a/workspace_tools/export/gcc_arm_hrm1017.tmpl b/tools/export/gcc_arm_hrm1017.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_hrm1017.tmpl rename to tools/export/gcc_arm_hrm1017.tmpl diff --git a/workspace_tools/export/gcc_arm_k20d50m.tmpl b/tools/export/gcc_arm_k20d50m.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_k20d50m.tmpl rename to tools/export/gcc_arm_k20d50m.tmpl diff --git a/workspace_tools/export/gcc_arm_k22f.tmpl b/tools/export/gcc_arm_k22f.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_k22f.tmpl rename to tools/export/gcc_arm_k22f.tmpl diff --git a/workspace_tools/export/gcc_arm_k64f.tmpl b/tools/export/gcc_arm_k64f.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_k64f.tmpl rename to tools/export/gcc_arm_k64f.tmpl diff --git a/workspace_tools/export/gcc_arm_kl05z.tmpl b/tools/export/gcc_arm_kl05z.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_kl05z.tmpl rename to tools/export/gcc_arm_kl05z.tmpl diff --git a/workspace_tools/export/gcc_arm_kl25z.tmpl b/tools/export/gcc_arm_kl25z.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_kl25z.tmpl rename to tools/export/gcc_arm_kl25z.tmpl diff --git a/workspace_tools/export/gcc_arm_kl43z.tmpl b/tools/export/gcc_arm_kl43z.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_kl43z.tmpl rename to tools/export/gcc_arm_kl43z.tmpl diff --git a/workspace_tools/export/gcc_arm_kl46z.tmpl b/tools/export/gcc_arm_kl46z.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_kl46z.tmpl rename to tools/export/gcc_arm_kl46z.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc1114.tmpl b/tools/export/gcc_arm_lpc1114.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc1114.tmpl rename to tools/export/gcc_arm_lpc1114.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc11u24.tmpl b/tools/export/gcc_arm_lpc11u24.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc11u24.tmpl rename to tools/export/gcc_arm_lpc11u24.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc11u35_401.tmpl b/tools/export/gcc_arm_lpc11u35_401.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc11u35_401.tmpl rename to tools/export/gcc_arm_lpc11u35_401.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc11u35_501.tmpl b/tools/export/gcc_arm_lpc11u35_501.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc11u35_501.tmpl rename to tools/export/gcc_arm_lpc11u35_501.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc11u37h_401.tmpl b/tools/export/gcc_arm_lpc11u37h_401.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc11u37h_401.tmpl rename to tools/export/gcc_arm_lpc11u37h_401.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc1549.tmpl b/tools/export/gcc_arm_lpc1549.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc1549.tmpl rename to tools/export/gcc_arm_lpc1549.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc1768.tmpl b/tools/export/gcc_arm_lpc1768.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc1768.tmpl rename to tools/export/gcc_arm_lpc1768.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc2368.tmpl b/tools/export/gcc_arm_lpc2368.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc2368.tmpl rename to tools/export/gcc_arm_lpc2368.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc2460.tmpl b/tools/export/gcc_arm_lpc2460.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc2460.tmpl rename to tools/export/gcc_arm_lpc2460.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc4088.tmpl b/tools/export/gcc_arm_lpc4088.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc4088.tmpl rename to tools/export/gcc_arm_lpc4088.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc4088_dm.tmpl b/tools/export/gcc_arm_lpc4088_dm.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc4088_dm.tmpl rename to tools/export/gcc_arm_lpc4088_dm.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc4330_m4.tmpl b/tools/export/gcc_arm_lpc4330_m4.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc4330_m4.tmpl rename to tools/export/gcc_arm_lpc4330_m4.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc810.tmpl b/tools/export/gcc_arm_lpc810.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc810.tmpl rename to tools/export/gcc_arm_lpc810.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc812.tmpl b/tools/export/gcc_arm_lpc812.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc812.tmpl rename to tools/export/gcc_arm_lpc812.tmpl diff --git a/workspace_tools/export/gcc_arm_lpc824.tmpl b/tools/export/gcc_arm_lpc824.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpc824.tmpl rename to tools/export/gcc_arm_lpc824.tmpl diff --git a/workspace_tools/export/gcc_arm_lpccappuccino.tmpl b/tools/export/gcc_arm_lpccappuccino.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_lpccappuccino.tmpl rename to tools/export/gcc_arm_lpccappuccino.tmpl diff --git a/workspace_tools/export/gcc_arm_max32600mbed.tmpl b/tools/export/gcc_arm_max32600mbed.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_max32600mbed.tmpl rename to tools/export/gcc_arm_max32600mbed.tmpl diff --git a/workspace_tools/export/gcc_arm_maxwsnenv.tmpl b/tools/export/gcc_arm_maxwsnenv.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_maxwsnenv.tmpl rename to tools/export/gcc_arm_maxwsnenv.tmpl diff --git a/workspace_tools/export/gcc_arm_mote_l152rc.tmpl b/tools/export/gcc_arm_mote_l152rc.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_mote_l152rc.tmpl rename to tools/export/gcc_arm_mote_l152rc.tmpl diff --git a/workspace_tools/export/gcc_arm_mts_gambit.tmpl b/tools/export/gcc_arm_mts_gambit.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_mts_gambit.tmpl rename to tools/export/gcc_arm_mts_gambit.tmpl diff --git a/workspace_tools/export/gcc_arm_mts_mdot_f405rg.tmpl b/tools/export/gcc_arm_mts_mdot_f405rg.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_mts_mdot_f405rg.tmpl rename to tools/export/gcc_arm_mts_mdot_f405rg.tmpl diff --git a/workspace_tools/export/gcc_arm_mts_mdot_f411re.tmpl b/tools/export/gcc_arm_mts_mdot_f411re.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_mts_mdot_f411re.tmpl rename to tools/export/gcc_arm_mts_mdot_f411re.tmpl diff --git a/workspace_tools/export/gcc_arm_nrf51822.tmpl b/tools/export/gcc_arm_nrf51822.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nrf51822.tmpl rename to tools/export/gcc_arm_nrf51822.tmpl diff --git a/workspace_tools/export/gcc_arm_nrf51_dk.tmpl b/tools/export/gcc_arm_nrf51_dk.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nrf51_dk.tmpl rename to tools/export/gcc_arm_nrf51_dk.tmpl diff --git a/workspace_tools/export/gcc_arm_nrf51_dongle.tmpl b/tools/export/gcc_arm_nrf51_dongle.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nrf51_dongle.tmpl rename to tools/export/gcc_arm_nrf51_dongle.tmpl diff --git a/workspace_tools/export/gcc_arm_nrf51_microbit.tmpl b/tools/export/gcc_arm_nrf51_microbit.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nrf51_microbit.tmpl rename to tools/export/gcc_arm_nrf51_microbit.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f030r8.tmpl b/tools/export/gcc_arm_nucleo_f030r8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f030r8.tmpl rename to tools/export/gcc_arm_nucleo_f030r8.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f031k6.tmpl b/tools/export/gcc_arm_nucleo_f031k6.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f031k6.tmpl rename to tools/export/gcc_arm_nucleo_f031k6.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f042k6.tmpl b/tools/export/gcc_arm_nucleo_f042k6.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f042k6.tmpl rename to tools/export/gcc_arm_nucleo_f042k6.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f070rb.tmpl b/tools/export/gcc_arm_nucleo_f070rb.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f070rb.tmpl rename to tools/export/gcc_arm_nucleo_f070rb.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f072rb.tmpl b/tools/export/gcc_arm_nucleo_f072rb.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f072rb.tmpl rename to tools/export/gcc_arm_nucleo_f072rb.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f091rc.tmpl b/tools/export/gcc_arm_nucleo_f091rc.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f091rc.tmpl rename to tools/export/gcc_arm_nucleo_f091rc.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f103rb.tmpl b/tools/export/gcc_arm_nucleo_f103rb.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f103rb.tmpl rename to tools/export/gcc_arm_nucleo_f103rb.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f302r8.tmpl b/tools/export/gcc_arm_nucleo_f302r8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f302r8.tmpl rename to tools/export/gcc_arm_nucleo_f302r8.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f303k8.tmpl b/tools/export/gcc_arm_nucleo_f303k8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f303k8.tmpl rename to tools/export/gcc_arm_nucleo_f303k8.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f303re.tmpl b/tools/export/gcc_arm_nucleo_f303re.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f303re.tmpl rename to tools/export/gcc_arm_nucleo_f303re.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f334r8.tmpl b/tools/export/gcc_arm_nucleo_f334r8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f334r8.tmpl rename to tools/export/gcc_arm_nucleo_f334r8.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f401re.tmpl b/tools/export/gcc_arm_nucleo_f401re.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f401re.tmpl rename to tools/export/gcc_arm_nucleo_f401re.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f410rb.tmpl b/tools/export/gcc_arm_nucleo_f410rb.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f410rb.tmpl rename to tools/export/gcc_arm_nucleo_f410rb.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f411re.tmpl b/tools/export/gcc_arm_nucleo_f411re.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f411re.tmpl rename to tools/export/gcc_arm_nucleo_f411re.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f446re.tmpl b/tools/export/gcc_arm_nucleo_f446re.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f446re.tmpl rename to tools/export/gcc_arm_nucleo_f446re.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_f746zg.tmpl b/tools/export/gcc_arm_nucleo_f746zg.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_f746zg.tmpl rename to tools/export/gcc_arm_nucleo_f746zg.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_l031k6.tmpl b/tools/export/gcc_arm_nucleo_l031k6.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_l031k6.tmpl rename to tools/export/gcc_arm_nucleo_l031k6.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_l053r8.tmpl b/tools/export/gcc_arm_nucleo_l053r8.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_l053r8.tmpl rename to tools/export/gcc_arm_nucleo_l053r8.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_l073rz.tmpl b/tools/export/gcc_arm_nucleo_l073rz.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_l073rz.tmpl rename to tools/export/gcc_arm_nucleo_l073rz.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_l152re.tmpl b/tools/export/gcc_arm_nucleo_l152re.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_l152re.tmpl rename to tools/export/gcc_arm_nucleo_l152re.tmpl diff --git a/workspace_tools/export/gcc_arm_nucleo_l476rg.tmpl b/tools/export/gcc_arm_nucleo_l476rg.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nucleo_l476rg.tmpl rename to tools/export/gcc_arm_nucleo_l476rg.tmpl diff --git a/workspace_tools/export/gcc_arm_nz32_sc151.tmpl b/tools/export/gcc_arm_nz32_sc151.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_nz32_sc151.tmpl rename to tools/export/gcc_arm_nz32_sc151.tmpl diff --git a/workspace_tools/export/gcc_arm_rblab_blenano.tmpl b/tools/export/gcc_arm_rblab_blenano.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_rblab_blenano.tmpl rename to tools/export/gcc_arm_rblab_blenano.tmpl diff --git a/workspace_tools/export/gcc_arm_rblab_nrf51822.tmpl b/tools/export/gcc_arm_rblab_nrf51822.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_rblab_nrf51822.tmpl rename to tools/export/gcc_arm_rblab_nrf51822.tmpl diff --git a/workspace_tools/export/gcc_arm_rz_a1h.tmpl b/tools/export/gcc_arm_rz_a1h.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_rz_a1h.tmpl rename to tools/export/gcc_arm_rz_a1h.tmpl diff --git a/workspace_tools/export/gcc_arm_samd21g18a.tmpl b/tools/export/gcc_arm_samd21g18a.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_samd21g18a.tmpl rename to tools/export/gcc_arm_samd21g18a.tmpl diff --git a/workspace_tools/export/gcc_arm_samd21j18a.tmpl b/tools/export/gcc_arm_samd21j18a.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_samd21j18a.tmpl rename to tools/export/gcc_arm_samd21j18a.tmpl diff --git a/workspace_tools/export/gcc_arm_samg55j19.tmpl b/tools/export/gcc_arm_samg55j19.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_samg55j19.tmpl rename to tools/export/gcc_arm_samg55j19.tmpl diff --git a/workspace_tools/export/gcc_arm_saml21j18a.tmpl b/tools/export/gcc_arm_saml21j18a.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_saml21j18a.tmpl rename to tools/export/gcc_arm_saml21j18a.tmpl diff --git a/workspace_tools/export/gcc_arm_samr21g18a.tmpl b/tools/export/gcc_arm_samr21g18a.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_samr21g18a.tmpl rename to tools/export/gcc_arm_samr21g18a.tmpl diff --git a/workspace_tools/export/gcc_arm_seeed_tiny_ble.tmpl b/tools/export/gcc_arm_seeed_tiny_ble.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_seeed_tiny_ble.tmpl rename to tools/export/gcc_arm_seeed_tiny_ble.tmpl diff --git a/workspace_tools/export/gcc_arm_ssci824.tmpl b/tools/export/gcc_arm_ssci824.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_ssci824.tmpl rename to tools/export/gcc_arm_ssci824.tmpl diff --git a/workspace_tools/export/gcc_arm_stm32f407.tmpl b/tools/export/gcc_arm_stm32f407.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_stm32f407.tmpl rename to tools/export/gcc_arm_stm32f407.tmpl diff --git a/workspace_tools/export/gcc_arm_teensy3_1.tmpl b/tools/export/gcc_arm_teensy3_1.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_teensy3_1.tmpl rename to tools/export/gcc_arm_teensy3_1.tmpl diff --git a/workspace_tools/export/gcc_arm_ublox_c027.tmpl b/tools/export/gcc_arm_ublox_c027.tmpl similarity index 100% rename from workspace_tools/export/gcc_arm_ublox_c027.tmpl rename to tools/export/gcc_arm_ublox_c027.tmpl diff --git a/workspace_tools/export/gccarm.py b/tools/export/gccarm.py old mode 100755 new mode 100644 similarity index 100% rename from workspace_tools/export/gccarm.py rename to tools/export/gccarm.py diff --git a/workspace_tools/export/iar.py b/tools/export/iar.py similarity index 98% rename from workspace_tools/export/iar.py rename to tools/export/iar.py index 3ba8e64b0c..e04368878e 100644 --- a/workspace_tools/export/iar.py +++ b/tools/export/iar.py @@ -18,8 +18,8 @@ import re 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' ``) diff --git a/workspace_tools/export/iar_nucleo_f746zg.ewp.tmpl b/tools/export/iar_nucleo_f746zg.ewp.tmpl similarity index 100% rename from workspace_tools/export/iar_nucleo_f746zg.ewp.tmpl rename to tools/export/iar_nucleo_f746zg.ewp.tmpl diff --git a/workspace_tools/export/iar_rz_a1h.ewp.tmpl b/tools/export/iar_rz_a1h.ewp.tmpl similarity index 100% rename from workspace_tools/export/iar_rz_a1h.ewp.tmpl rename to tools/export/iar_rz_a1h.ewp.tmpl diff --git a/workspace_tools/export/iar_template.ewp.tmpl b/tools/export/iar_template.ewp.tmpl similarity index 100% rename from workspace_tools/export/iar_template.ewp.tmpl rename to tools/export/iar_template.ewp.tmpl diff --git a/workspace_tools/export/kds.py b/tools/export/kds.py similarity index 100% rename from workspace_tools/export/kds.py rename to tools/export/kds.py diff --git a/workspace_tools/export/kds_k22f_cproject.tmpl b/tools/export/kds_k22f_cproject.tmpl similarity index 100% rename from workspace_tools/export/kds_k22f_cproject.tmpl rename to tools/export/kds_k22f_cproject.tmpl diff --git a/workspace_tools/export/kds_k22f_project.tmpl b/tools/export/kds_k22f_project.tmpl similarity index 100% rename from workspace_tools/export/kds_k22f_project.tmpl rename to tools/export/kds_k22f_project.tmpl diff --git a/workspace_tools/export/kds_k64f_cproject.tmpl b/tools/export/kds_k64f_cproject.tmpl similarity index 100% rename from workspace_tools/export/kds_k64f_cproject.tmpl rename to tools/export/kds_k64f_cproject.tmpl diff --git a/workspace_tools/export/kds_k64f_project.tmpl b/tools/export/kds_k64f_project.tmpl similarity index 100% rename from workspace_tools/export/kds_k64f_project.tmpl rename to tools/export/kds_k64f_project.tmpl diff --git a/workspace_tools/export/kds_launch.tmpl b/tools/export/kds_launch.tmpl similarity index 100% rename from workspace_tools/export/kds_launch.tmpl rename to tools/export/kds_launch.tmpl diff --git a/workspace_tools/export/simplicityv3.py b/tools/export/simplicityv3.py similarity index 100% rename from workspace_tools/export/simplicityv3.py rename to tools/export/simplicityv3.py diff --git a/workspace_tools/export/simplicityv3_slsproj.tmpl b/tools/export/simplicityv3_slsproj.tmpl similarity index 100% rename from workspace_tools/export/simplicityv3_slsproj.tmpl rename to tools/export/simplicityv3_slsproj.tmpl diff --git a/workspace_tools/export/sw4stm32.py b/tools/export/sw4stm32.py similarity index 99% rename from workspace_tools/export/sw4stm32.py rename to tools/export/sw4stm32.py index cc383c3670..0d9e8e881d 100644 --- a/workspace_tools/export/sw4stm32.py +++ b/tools/export/sw4stm32.py @@ -17,7 +17,7 @@ limitations under the License. from exporters import Exporter from os.path import splitext, basename, join from random import randint -from workspace_tools.utils import mkdir +from tools.utils import mkdir class Sw4STM32(Exporter): diff --git a/workspace_tools/export/sw4stm32_cproject_common.tmpl b/tools/export/sw4stm32_cproject_common.tmpl similarity index 100% rename from workspace_tools/export/sw4stm32_cproject_common.tmpl rename to tools/export/sw4stm32_cproject_common.tmpl diff --git a/workspace_tools/export/sw4stm32_language_settings_commom.tmpl b/tools/export/sw4stm32_language_settings_commom.tmpl similarity index 100% rename from workspace_tools/export/sw4stm32_language_settings_commom.tmpl rename to tools/export/sw4stm32_language_settings_commom.tmpl diff --git a/workspace_tools/export/sw4stm32_project_common.tmpl b/tools/export/sw4stm32_project_common.tmpl similarity index 100% rename from workspace_tools/export/sw4stm32_project_common.tmpl rename to tools/export/sw4stm32_project_common.tmpl diff --git a/workspace_tools/export/uvision.uvproj.tmpl b/tools/export/uvision.uvproj.tmpl similarity index 100% rename from workspace_tools/export/uvision.uvproj.tmpl rename to tools/export/uvision.uvproj.tmpl diff --git a/workspace_tools/export/uvision4.py b/tools/export/uvision4.py similarity index 97% rename from workspace_tools/export/uvision4.py rename to tools/export/uvision4.py index 7f26bfde2d..fc0e34e9f1 100644 --- a/workspace_tools/export/uvision4.py +++ b/tools/export/uvision4.py @@ -17,8 +17,8 @@ limitations under the License. from os.path import basename, join, dirname 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' ``) diff --git a/workspace_tools/export/uvision5.py b/tools/export/uvision5.py similarity index 97% rename from workspace_tools/export/uvision5.py rename to tools/export/uvision5.py index a8813799a0..7662ffdfb2 100644 --- a/workspace_tools/export/uvision5.py +++ b/tools/export/uvision5.py @@ -17,8 +17,8 @@ limitations under the License. from os.path import basename, join, dirname 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' ``) diff --git a/workspace_tools/export/uvision_microlib.uvproj.tmpl b/tools/export/uvision_microlib.uvproj.tmpl similarity index 100% rename from workspace_tools/export/uvision_microlib.uvproj.tmpl rename to tools/export/uvision_microlib.uvproj.tmpl diff --git a/workspace_tools/export/zip.py b/tools/export/zip.py similarity index 100% rename from workspace_tools/export/zip.py rename to tools/export/zip.py diff --git a/workspace_tools/export_test.py b/tools/export_test.py similarity index 98% rename from workspace_tools/export_test.py rename to tools/export_test.py index 6295d03d0e..fdb990c541 100644 --- a/workspace_tools/export_test.py +++ b/tools/export_test.py @@ -22,9 +22,9 @@ sys.path.insert(0, ROOT) from shutil import move -from workspace_tools.paths import * -from workspace_tools.utils import mkdir, cmd -from workspace_tools.export import export, setup_user_prj +from tools.paths import * +from tools.utils import mkdir, cmd +from tools.export import export, setup_user_prj USR_PRJ_NAME = "usr_prj" diff --git a/workspace_tools/hooks.py b/tools/hooks.py similarity index 100% rename from workspace_tools/hooks.py rename to tools/hooks.py diff --git a/workspace_tools/host_tests/__init__.py b/tools/host_tests/__init__.py similarity index 100% rename from workspace_tools/host_tests/__init__.py rename to tools/host_tests/__init__.py diff --git a/workspace_tools/host_tests/default_auto.py b/tools/host_tests/default_auto.py similarity index 100% rename from workspace_tools/host_tests/default_auto.py rename to tools/host_tests/default_auto.py diff --git a/workspace_tools/host_tests/detect_auto.py b/tools/host_tests/detect_auto.py similarity index 100% rename from workspace_tools/host_tests/detect_auto.py rename to tools/host_tests/detect_auto.py diff --git a/workspace_tools/host_tests/dev_null_auto.py b/tools/host_tests/dev_null_auto.py similarity index 100% rename from workspace_tools/host_tests/dev_null_auto.py rename to tools/host_tests/dev_null_auto.py diff --git a/workspace_tools/host_tests/echo.py b/tools/host_tests/echo.py similarity index 100% rename from workspace_tools/host_tests/echo.py rename to tools/host_tests/echo.py diff --git a/workspace_tools/host_tests/echo_flow_control.py b/tools/host_tests/echo_flow_control.py similarity index 100% rename from workspace_tools/host_tests/echo_flow_control.py rename to tools/host_tests/echo_flow_control.py diff --git a/workspace_tools/host_tests/example/BroadcastReceive.py b/tools/host_tests/example/BroadcastReceive.py similarity index 100% rename from workspace_tools/host_tests/example/BroadcastReceive.py rename to tools/host_tests/example/BroadcastReceive.py diff --git a/workspace_tools/host_tests/example/BroadcastSend.py b/tools/host_tests/example/BroadcastSend.py similarity index 100% rename from workspace_tools/host_tests/example/BroadcastSend.py rename to tools/host_tests/example/BroadcastSend.py diff --git a/workspace_tools/host_tests/example/MulticastReceive.py b/tools/host_tests/example/MulticastReceive.py similarity index 100% rename from workspace_tools/host_tests/example/MulticastReceive.py rename to tools/host_tests/example/MulticastReceive.py diff --git a/workspace_tools/host_tests/example/MulticastSend.py b/tools/host_tests/example/MulticastSend.py similarity index 100% rename from workspace_tools/host_tests/example/MulticastSend.py rename to tools/host_tests/example/MulticastSend.py diff --git a/workspace_tools/host_tests/example/TCPEchoClient.py b/tools/host_tests/example/TCPEchoClient.py similarity index 100% rename from workspace_tools/host_tests/example/TCPEchoClient.py rename to tools/host_tests/example/TCPEchoClient.py diff --git a/workspace_tools/host_tests/example/TCPEchoServer.py b/tools/host_tests/example/TCPEchoServer.py similarity index 100% rename from workspace_tools/host_tests/example/TCPEchoServer.py rename to tools/host_tests/example/TCPEchoServer.py diff --git a/workspace_tools/host_tests/example/UDPEchoClient.py b/tools/host_tests/example/UDPEchoClient.py similarity index 100% rename from workspace_tools/host_tests/example/UDPEchoClient.py rename to tools/host_tests/example/UDPEchoClient.py diff --git a/workspace_tools/host_tests/example/UDPEchoServer.py b/tools/host_tests/example/UDPEchoServer.py similarity index 100% rename from workspace_tools/host_tests/example/UDPEchoServer.py rename to tools/host_tests/example/UDPEchoServer.py diff --git a/workspace_tools/host_tests/example/__init__.py b/tools/host_tests/example/__init__.py similarity index 100% rename from workspace_tools/host_tests/example/__init__.py rename to tools/host_tests/example/__init__.py diff --git a/workspace_tools/host_tests/hello_auto.py b/tools/host_tests/hello_auto.py similarity index 100% rename from workspace_tools/host_tests/hello_auto.py rename to tools/host_tests/hello_auto.py diff --git a/workspace_tools/host_tests/host_registry.py b/tools/host_tests/host_registry.py similarity index 100% rename from workspace_tools/host_tests/host_registry.py rename to tools/host_tests/host_registry.py diff --git a/workspace_tools/host_tests/host_test.py b/tools/host_tests/host_test.py similarity index 98% rename from workspace_tools/host_tests/host_test.py rename to tools/host_tests/host_test.py index 103df83924..fe611cb145 100644 --- a/workspace_tools/host_tests/host_test.py +++ b/tools/host_tests/host_test.py @@ -35,8 +35,8 @@ import host_tests_plugins # we can find packages we want from the same level as other files do import sys sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../..'))) -from workspace_tools.test_api import get_autodetected_MUTS_list -from workspace_tools.test_api import get_module_avail +from tools.test_api import get_autodetected_MUTS_list +from tools.test_api import get_module_avail class Mbed: @@ -313,7 +313,7 @@ class HostTestResults: self.RESULT_MBED_ASSERT = "mbed_assert" -import workspace_tools.host_tests as host_tests +import tools.host_tests as host_tests class Test(HostTestResults): diff --git a/workspace_tools/host_tests/host_tests_plugins/__init__.py b/tools/host_tests/host_tests_plugins/__init__.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/__init__.py rename to tools/host_tests/host_tests_plugins/__init__.py diff --git a/workspace_tools/host_tests/host_tests_plugins/host_test_plugins.py b/tools/host_tests/host_tests_plugins/host_test_plugins.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/host_test_plugins.py rename to tools/host_tests/host_tests_plugins/host_test_plugins.py diff --git a/workspace_tools/host_tests/host_tests_plugins/host_test_registry.py b/tools/host_tests/host_tests_plugins/host_test_registry.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/host_test_registry.py rename to tools/host_tests/host_tests_plugins/host_test_registry.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_firefox.py b/tools/host_tests/host_tests_plugins/module_copy_firefox.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_copy_firefox.py rename to tools/host_tests/host_tests_plugins/module_copy_firefox.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_mbed.py b/tools/host_tests/host_tests_plugins/module_copy_mbed.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_copy_mbed.py rename to tools/host_tests/host_tests_plugins/module_copy_mbed.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_mps2.py b/tools/host_tests/host_tests_plugins/module_copy_mps2.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_copy_mps2.py rename to tools/host_tests/host_tests_plugins/module_copy_mps2.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_shell.py b/tools/host_tests/host_tests_plugins/module_copy_shell.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_copy_shell.py rename to tools/host_tests/host_tests_plugins/module_copy_shell.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_silabs.py b/tools/host_tests/host_tests_plugins/module_copy_silabs.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_copy_silabs.py rename to tools/host_tests/host_tests_plugins/module_copy_silabs.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_copy_smart.py b/tools/host_tests/host_tests_plugins/module_copy_smart.py similarity index 98% rename from workspace_tools/host_tests/host_tests_plugins/module_copy_smart.py rename to tools/host_tests/host_tests_plugins/module_copy_smart.py index 9fb5970d46..1af9eaf70a 100644 --- a/workspace_tools/host_tests/host_tests_plugins/module_copy_smart.py +++ b/tools/host_tests/host_tests_plugins/module_copy_smart.py @@ -22,7 +22,7 @@ from time import sleep from host_test_plugins import HostTestPluginBase sys.path.append(abspath(join(dirname(__file__), "../../../"))) -from workspace_tools.test_api import get_autodetected_MUTS_list +from tools.test_api import get_autodetected_MUTS_list class HostTestPluginCopyMethod_Smart(HostTestPluginBase): diff --git a/workspace_tools/host_tests/host_tests_plugins/module_reset_mbed.py b/tools/host_tests/host_tests_plugins/module_reset_mbed.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_reset_mbed.py rename to tools/host_tests/host_tests_plugins/module_reset_mbed.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_reset_mps2.py b/tools/host_tests/host_tests_plugins/module_reset_mps2.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_reset_mps2.py rename to tools/host_tests/host_tests_plugins/module_reset_mps2.py diff --git a/workspace_tools/host_tests/host_tests_plugins/module_reset_silabs.py b/tools/host_tests/host_tests_plugins/module_reset_silabs.py similarity index 100% rename from workspace_tools/host_tests/host_tests_plugins/module_reset_silabs.py rename to tools/host_tests/host_tests_plugins/module_reset_silabs.py diff --git a/workspace_tools/host_tests/mbedrpc.py b/tools/host_tests/mbedrpc.py similarity index 100% rename from workspace_tools/host_tests/mbedrpc.py rename to tools/host_tests/mbedrpc.py diff --git a/workspace_tools/host_tests/midi.py b/tools/host_tests/midi.py similarity index 100% rename from workspace_tools/host_tests/midi.py rename to tools/host_tests/midi.py diff --git a/workspace_tools/host_tests/net_test.py b/tools/host_tests/net_test.py similarity index 100% rename from workspace_tools/host_tests/net_test.py rename to tools/host_tests/net_test.py diff --git a/workspace_tools/host_tests/rpc.py b/tools/host_tests/rpc.py similarity index 100% rename from workspace_tools/host_tests/rpc.py rename to tools/host_tests/rpc.py diff --git a/workspace_tools/host_tests/rtc_auto.py b/tools/host_tests/rtc_auto.py similarity index 100% rename from workspace_tools/host_tests/rtc_auto.py rename to tools/host_tests/rtc_auto.py diff --git a/workspace_tools/host_tests/serial_nc_rx_auto.py b/tools/host_tests/serial_nc_rx_auto.py similarity index 100% rename from workspace_tools/host_tests/serial_nc_rx_auto.py rename to tools/host_tests/serial_nc_rx_auto.py diff --git a/workspace_tools/host_tests/serial_nc_tx_auto.py b/tools/host_tests/serial_nc_tx_auto.py similarity index 100% rename from workspace_tools/host_tests/serial_nc_tx_auto.py rename to tools/host_tests/serial_nc_tx_auto.py diff --git a/workspace_tools/host_tests/stdio_auto.py b/tools/host_tests/stdio_auto.py similarity index 100% rename from workspace_tools/host_tests/stdio_auto.py rename to tools/host_tests/stdio_auto.py diff --git a/workspace_tools/host_tests/tcpecho_client.py b/tools/host_tests/tcpecho_client.py similarity index 100% rename from workspace_tools/host_tests/tcpecho_client.py rename to tools/host_tests/tcpecho_client.py diff --git a/workspace_tools/host_tests/tcpecho_client_auto.py b/tools/host_tests/tcpecho_client_auto.py similarity index 100% rename from workspace_tools/host_tests/tcpecho_client_auto.py rename to tools/host_tests/tcpecho_client_auto.py diff --git a/workspace_tools/host_tests/tcpecho_server.py b/tools/host_tests/tcpecho_server.py similarity index 100% rename from workspace_tools/host_tests/tcpecho_server.py rename to tools/host_tests/tcpecho_server.py diff --git a/workspace_tools/host_tests/tcpecho_server_auto.py b/tools/host_tests/tcpecho_server_auto.py similarity index 100% rename from workspace_tools/host_tests/tcpecho_server_auto.py rename to tools/host_tests/tcpecho_server_auto.py diff --git a/workspace_tools/host_tests/tcpecho_server_loop.py b/tools/host_tests/tcpecho_server_loop.py similarity index 95% rename from workspace_tools/host_tests/tcpecho_server_loop.py rename to tools/host_tests/tcpecho_server_loop.py index df483974aa..be95f1319a 100644 --- a/workspace_tools/host_tests/tcpecho_server_loop.py +++ b/tools/host_tests/tcpecho_server_loop.py @@ -20,7 +20,7 @@ from os.path import join, abspath, dirname ROOT = abspath(join(dirname(__file__), "..", "..")) sys.path.insert(0, ROOT) -from workspace_tools.private_settings import LOCALHOST +from tools.private_settings import LOCALHOST from SocketServer import BaseRequestHandler, TCPServer diff --git a/workspace_tools/host_tests/udp_link_layer_auto.py b/tools/host_tests/udp_link_layer_auto.py similarity index 100% rename from workspace_tools/host_tests/udp_link_layer_auto.py rename to tools/host_tests/udp_link_layer_auto.py diff --git a/workspace_tools/host_tests/udpecho_client.py b/tools/host_tests/udpecho_client.py similarity index 100% rename from workspace_tools/host_tests/udpecho_client.py rename to tools/host_tests/udpecho_client.py diff --git a/workspace_tools/host_tests/udpecho_client_auto.py b/tools/host_tests/udpecho_client_auto.py similarity index 100% rename from workspace_tools/host_tests/udpecho_client_auto.py rename to tools/host_tests/udpecho_client_auto.py diff --git a/workspace_tools/host_tests/udpecho_server.py b/tools/host_tests/udpecho_server.py similarity index 100% rename from workspace_tools/host_tests/udpecho_server.py rename to tools/host_tests/udpecho_server.py diff --git a/workspace_tools/host_tests/udpecho_server_auto.py b/tools/host_tests/udpecho_server_auto.py similarity index 100% rename from workspace_tools/host_tests/udpecho_server_auto.py rename to tools/host_tests/udpecho_server_auto.py diff --git a/workspace_tools/host_tests/wait_us_auto.py b/tools/host_tests/wait_us_auto.py similarity index 100% rename from workspace_tools/host_tests/wait_us_auto.py rename to tools/host_tests/wait_us_auto.py diff --git a/workspace_tools/host_tests/wfi_auto.py b/tools/host_tests/wfi_auto.py similarity index 100% rename from workspace_tools/host_tests/wfi_auto.py rename to tools/host_tests/wfi_auto.py diff --git a/workspace_tools/libraries.py b/tools/libraries.py similarity index 96% rename from workspace_tools/libraries.py rename to tools/libraries.py index c4db6c8e79..a6d2c0b165 100644 --- a/workspace_tools/libraries.py +++ b/tools/libraries.py @@ -14,9 +14,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -from workspace_tools.paths import * -from workspace_tools.data.support import * -from workspace_tools.tests import TEST_MBED_LIB +from tools.paths import * +from tools.data.support import * +from tools.tests import TEST_MBED_LIB LIBRARIES = [ diff --git a/workspace_tools/make.py b/tools/make.py old mode 100755 new mode 100644 similarity index 93% rename from workspace_tools/make.py rename to tools/make.py index e4ade4cbbf..adfd82bf39 --- a/workspace_tools/make.py +++ b/tools/make.py @@ -27,22 +27,22 @@ from os.path import join, abspath, dirname ROOT = abspath(join(dirname(__file__), "..")) sys.path.insert(0, ROOT) -from workspace_tools.utils import args_error -from workspace_tools.paths import BUILD_DIR -from workspace_tools.paths import RTOS_LIBRARIES -from workspace_tools.paths import RPC_LIBRARY -from workspace_tools.paths import ETH_LIBRARY -from workspace_tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES -from workspace_tools.paths import DSP_LIBRARIES -from workspace_tools.paths import FS_LIBRARY -from workspace_tools.paths import UBLOX_LIBRARY -from workspace_tools.tests import TESTS, Test, TEST_MAP -from workspace_tools.tests import TEST_MBED_LIB -from workspace_tools.targets import TARGET_MAP -from workspace_tools.options import get_default_options_parser -from workspace_tools.build_api import build_project +from tools.utils import args_error +from tools.paths import BUILD_DIR +from tools.paths import RTOS_LIBRARIES +from tools.paths import RPC_LIBRARY +from tools.paths import ETH_LIBRARY +from tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES +from tools.paths import DSP_LIBRARIES +from tools.paths import FS_LIBRARY +from tools.paths import UBLOX_LIBRARY +from tools.tests import TESTS, Test, TEST_MAP +from tools.tests import TEST_MBED_LIB +from tools.targets import TARGET_MAP +from tools.options import get_default_options_parser +from tools.build_api import build_project try: - import workspace_tools.private_settings as ps + import tools.private_settings as ps except: ps = object() diff --git a/workspace_tools/options.py b/tools/options.py similarity index 93% rename from workspace_tools/options.py rename to tools/options.py index 3e4d2e859c..cf146c47bd 100644 --- a/workspace_tools/options.py +++ b/tools/options.py @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. """ from optparse import OptionParser -from workspace_tools.toolchains import TOOLCHAINS -from workspace_tools.targets import TARGET_NAMES +from tools.toolchains import TOOLCHAINS +from tools.targets import TARGET_NAMES def get_default_options_parser(): diff --git a/workspace_tools/patch.py b/tools/patch.py similarity index 100% rename from workspace_tools/patch.py rename to tools/patch.py diff --git a/workspace_tools/paths.py b/tools/paths.py similarity index 97% rename from workspace_tools/paths.py rename to tools/paths.py index 849995fb97..cdff2798d1 100644 --- a/workspace_tools/paths.py +++ b/tools/paths.py @@ -26,7 +26,7 @@ BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR # Embedded Libraries Sources LIB_DIR = join(ROOT, "libraries") -TOOLS = join(ROOT, "workspace_tools") +TOOLS = join(ROOT, "tools") TOOLS_DATA = join(TOOLS, "data") TOOLS_BOOTLOADERS = join(TOOLS, "bootloaders") @@ -42,7 +42,7 @@ MBED_LIBRARIES = join(BUILD_DIR, "mbed") # Tests TEST_DIR = join(LIB_DIR, "tests") -HOST_TESTS = join(ROOT, "workspace_tools", "host_tests") +HOST_TESTS = join(ROOT, "tools", "host_tests") # mbed RPC MBED_RPC = join(LIB_DIR, "rpc") diff --git a/workspace_tools/project.py b/tools/project.py similarity index 93% rename from workspace_tools/project.py rename to tools/project.py index 7bf165b0bd..505f676912 100644 --- a/workspace_tools/project.py +++ b/tools/project.py @@ -6,16 +6,16 @@ sys.path.insert(0, ROOT) from shutil import move, rmtree from optparse import OptionParser -from workspace_tools.paths import EXPORT_DIR, EXPORT_WORKSPACE, EXPORT_TMP -from workspace_tools.paths import MBED_BASE, MBED_LIBRARIES -from workspace_tools.export import export, setup_user_prj, EXPORTERS, mcu_ide_matrix -from workspace_tools.utils import args_error -from workspace_tools.tests import TESTS, Test, TEST_MAP -from workspace_tools.targets import TARGET_NAMES -from workspace_tools.libraries import LIBRARIES +from tools.paths import EXPORT_DIR, EXPORT_WORKSPACE, EXPORT_TMP +from tools.paths import MBED_BASE, MBED_LIBRARIES +from tools.export import export, setup_user_prj, EXPORTERS, mcu_ide_matrix +from tools.utils import args_error +from tools.tests import TESTS, Test, TEST_MAP +from tools.targets import TARGET_NAMES +from tools.libraries import LIBRARIES try: - import workspace_tools.private_settings as ps + import tools.private_settings as ps except: ps = object() diff --git a/workspace_tools/remove-device-h.py b/tools/remove-device-h.py similarity index 100% rename from workspace_tools/remove-device-h.py rename to tools/remove-device-h.py diff --git a/workspace_tools/settings.py b/tools/settings.py similarity index 98% rename from workspace_tools/settings.py rename to tools/settings.py index 0a62ed9c81..cd416a0610 100644 --- a/workspace_tools/settings.py +++ b/tools/settings.py @@ -99,6 +99,6 @@ MUTs = { try: # Allow to overwrite the default settings without the need to edit the # settings file stored in the repository - from workspace_tools.private_settings import * + from tools.private_settings import * except ImportError: print '[WARNING] Using default settings. Define your settings in the file "workspace_tools/private_settings.py" or in "./mbed_settings.py"' diff --git a/workspace_tools/singletest.py b/tools/singletest.py similarity index 91% rename from workspace_tools/singletest.py rename to tools/singletest.py index 6b5054baca..058b96d4d1 100644 --- a/workspace_tools/singletest.py +++ b/tools/singletest.py @@ -56,32 +56,32 @@ sys.path.insert(0, ROOT) # Check: Extra modules which are required by core test suite -from workspace_tools.utils import check_required_modules +from tools.utils import check_required_modules check_required_modules(['prettytable', 'serial']) # Imports related to mbed build api -from workspace_tools.build_api import mcu_toolchain_matrix +from tools.build_api import mcu_toolchain_matrix # Imports from TEST API -from workspace_tools.test_api import SingleTestRunner -from workspace_tools.test_api import singletest_in_cli_mode -from workspace_tools.test_api import detect_database_verbose -from workspace_tools.test_api import get_json_data_from_file -from workspace_tools.test_api import get_avail_tests_summary_table -from workspace_tools.test_api import get_default_test_options_parser -from workspace_tools.test_api import print_muts_configuration_from_json -from workspace_tools.test_api import print_test_configuration_from_json -from workspace_tools.test_api import get_autodetected_MUTS_list -from workspace_tools.test_api import get_autodetected_TEST_SPEC -from workspace_tools.test_api import get_module_avail -from workspace_tools.test_exporters import ReportExporter, ResultExporterType +from tools.test_api import SingleTestRunner +from tools.test_api import singletest_in_cli_mode +from tools.test_api import detect_database_verbose +from tools.test_api import get_json_data_from_file +from tools.test_api import get_avail_tests_summary_table +from tools.test_api import get_default_test_options_parser +from tools.test_api import print_muts_configuration_from_json +from tools.test_api import print_test_configuration_from_json +from tools.test_api import get_autodetected_MUTS_list +from tools.test_api import get_autodetected_TEST_SPEC +from tools.test_api import get_module_avail +from tools.test_exporters import ReportExporter, ResultExporterType # Importing extra modules which can be not installed but if available they can extend test suite functionality try: import mbed_lstools - from workspace_tools.compliance.ioper_runner import IOperTestRunner - from workspace_tools.compliance.ioper_runner import get_available_oper_test_scopes + from tools.compliance.ioper_runner import IOperTestRunner + from tools.compliance.ioper_runner import get_available_oper_test_scopes except: pass diff --git a/workspace_tools/size.py b/tools/size.py similarity index 94% rename from workspace_tools/size.py rename to tools/size.py index 48ed5366be..0e19ae395e 100644 --- a/workspace_tools/size.py +++ b/tools/size.py @@ -23,10 +23,10 @@ from collections import defaultdict ROOT = abspath(join(dirname(__file__), "..")) sys.path.insert(0, ROOT) -from workspace_tools.paths import BUILD_DIR, TOOLS_DATA -from workspace_tools.settings import GCC_ARM_PATH -from workspace_tools.tests import TEST_MAP -from workspace_tools.build_api import build_mbed_libs, build_project +from tools.paths import BUILD_DIR, TOOLS_DATA +from tools.settings import GCC_ARM_PATH +from tools.tests import TEST_MAP +from tools.build_api import build_mbed_libs, build_project SIZE = join(GCC_ARM_PATH, 'arm-none-eabi-size') diff --git a/workspace_tools/synch.py b/tools/synch.py similarity index 98% rename from workspace_tools/synch.py rename to tools/synch.py index 9d95034e64..4efeb2c3ea 100644 --- a/workspace_tools/synch.py +++ b/tools/synch.py @@ -31,9 +31,9 @@ import string ROOT = abspath(join(dirname(__file__), "..")) sys.path.insert(0, ROOT) -from workspace_tools.settings import MBED_ORG_PATH, MBED_ORG_USER, BUILD_DIR -from workspace_tools.paths import * -from workspace_tools.utils import run_cmd +from tools.settings import MBED_ORG_PATH, MBED_ORG_USER, BUILD_DIR +from tools.paths import * +from tools.utils import run_cmd MBED_URL = "mbed.org" MBED_USER = "mbed_official" diff --git a/workspace_tools/targets.py b/tools/targets.py old mode 100755 new mode 100644 similarity index 99% rename from workspace_tools/targets.py rename to tools/targets.py index aa02af962d..806d8b7fac --- a/workspace_tools/targets.py +++ b/tools/targets.py @@ -32,7 +32,7 @@ import os import binascii import struct import shutil -from workspace_tools.patch import patch +from tools.patch import patch from paths import TOOLS_BOOTLOADERS import json import inspect diff --git a/workspace_tools/test_api.py b/tools/test_api.py similarity index 98% rename from workspace_tools/test_api.py rename to tools/test_api.py index d80c0c3f07..4df448e7aa 100644 --- a/workspace_tools/test_api.py +++ b/tools/test_api.py @@ -39,31 +39,31 @@ from threading import Thread, Lock from subprocess import Popen, PIPE # Imports related to mbed build api -from workspace_tools.tests import TESTS -from workspace_tools.tests import TEST_MAP -from workspace_tools.paths import BUILD_DIR -from workspace_tools.paths import HOST_TESTS -from workspace_tools.utils import ToolException -from workspace_tools.utils import NotSupportedException -from workspace_tools.utils import construct_enum -from workspace_tools.targets import TARGET_MAP -from workspace_tools.test_db import BaseDBAccess -from workspace_tools.build_api import build_project, build_mbed_libs, build_lib -from workspace_tools.build_api import get_target_supported_toolchains -from workspace_tools.build_api import write_build_report -from workspace_tools.build_api import prep_report -from workspace_tools.build_api import prep_properties -from workspace_tools.build_api import create_result -from workspace_tools.build_api import add_result_to_report -from workspace_tools.libraries import LIBRARIES, LIBRARY_MAP -from workspace_tools.toolchains import TOOLCHAIN_BIN_PATH -from workspace_tools.test_exporters import ReportExporter, ResultExporterType +from tools.tests import TESTS +from tools.tests import TEST_MAP +from tools.paths import BUILD_DIR +from tools.paths import HOST_TESTS +from tools.utils import ToolException +from tools.utils import NotSupportedException +from tools.utils import construct_enum +from tools.targets import TARGET_MAP +from tools.test_db import BaseDBAccess +from tools.build_api import build_project, build_mbed_libs, build_lib +from tools.build_api import get_target_supported_toolchains +from tools.build_api import write_build_report +from tools.build_api import prep_report +from tools.build_api import prep_properties +from tools.build_api import create_result +from tools.build_api import add_result_to_report +from tools.libraries import LIBRARIES, LIBRARY_MAP +from tools.toolchains import TOOLCHAIN_BIN_PATH +from tools.test_exporters import ReportExporter, ResultExporterType -import workspace_tools.host_tests.host_tests_plugins as host_tests_plugins +import tools.host_tests.host_tests_plugins as host_tests_plugins try: import mbed_lstools - from workspace_tools.compliance.ioper_runner import get_available_oper_test_scopes + from tools.compliance.ioper_runner import get_available_oper_test_scopes except: pass @@ -1592,7 +1592,7 @@ def factory_db_logger(db_url): """ Factory database driver depending on database type supplied in database connection string db_url """ if db_url is not None: - from workspace_tools.test_mysql import MySQLDBAccess + from tools.test_mysql import MySQLDBAccess connection_info = BaseDBAccess().parse_db_connection_string(db_url) if connection_info is not None: (db_type, username, password, host, db_name) = BaseDBAccess().parse_db_connection_string(db_url) diff --git a/workspace_tools/test_db.py b/tools/test_db.py similarity index 100% rename from workspace_tools/test_db.py rename to tools/test_db.py diff --git a/workspace_tools/test_exporters.py b/tools/test_exporters.py similarity index 99% rename from workspace_tools/test_exporters.py rename to tools/test_exporters.py index 623acd6f4d..16c5e47409 100644 --- a/workspace_tools/test_exporters.py +++ b/tools/test_exporters.py @@ -17,7 +17,7 @@ limitations under the License. Author: Przemyslaw Wirkus """ -from workspace_tools.utils import construct_enum +from tools.utils import construct_enum ResultExporterType = construct_enum(HTML='Html_Exporter', diff --git a/workspace_tools/test_mysql.py b/tools/test_mysql.py similarity index 99% rename from workspace_tools/test_mysql.py rename to tools/test_mysql.py index 1561dab32f..4f00ab6dd9 100644 --- a/workspace_tools/test_mysql.py +++ b/tools/test_mysql.py @@ -21,7 +21,7 @@ import re import MySQLdb as mdb # Imports from TEST API -from workspace_tools.test_db import BaseDBAccess +from tools.test_db import BaseDBAccess class MySQLDBAccess(BaseDBAccess): diff --git a/workspace_tools/test_webapi.py b/tools/test_webapi.py similarity index 98% rename from workspace_tools/test_webapi.py rename to tools/test_webapi.py index 59273e80d2..ffed0e4624 100644 --- a/workspace_tools/test_webapi.py +++ b/tools/test_webapi.py @@ -28,8 +28,8 @@ ROOT = abspath(join(dirname(__file__), "..")) sys.path.insert(0, ROOT) # Imports related to mbed build api -from workspace_tools.utils import construct_enum -from workspace_tools.build_api import mcu_toolchain_matrix +from tools.utils import construct_enum +from tools.build_api import mcu_toolchain_matrix # Imports from TEST API from test_api import SingleTestRunner diff --git a/workspace_tools/tests.py b/tools/tests.py similarity index 99% rename from workspace_tools/tests.py rename to tools/tests.py index 924c028063..7701aae128 100644 --- a/workspace_tools/tests.py +++ b/tools/tests.py @@ -14,8 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -from workspace_tools.paths import * -from workspace_tools.data.support import * +from tools.paths import * +from tools.data.support import * TEST_CMSIS_LIB = join(TEST_DIR, "cmsis", "lib") TEST_MBED_LIB = join(TEST_DIR, "mbed", "env") @@ -1145,7 +1145,7 @@ GROUPS["automated"] = [test["id"] for test in TESTS if test.get("automated", Fal # Look for 'TEST_GROUPS' in private_settings.py and update the GROUPS dictionary # with the information in test_groups if found try: - from workspace_tools.private_settings import TEST_GROUPS + from tools.private_settings import TEST_GROUPS except: TEST_GROUPS = {} GROUPS.update(TEST_GROUPS) diff --git a/workspace_tools/toolchains/__init__.py b/tools/toolchains/__init__.py similarity index 98% rename from workspace_tools/toolchains/__init__.py rename to tools/toolchains/__init__.py index 16b9f4dfe2..75ac253260 100644 --- a/workspace_tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -26,9 +26,9 @@ from os.path import join, splitext, exists, relpath, dirname, basename, split from inspect import getmro from multiprocessing import Pool, cpu_count -from workspace_tools.utils import run_cmd, mkdir, rel_path, ToolException, NotSupportedException, split_path -from workspace_tools.settings import BUILD_OPTIONS, MBED_ORG_USER -import workspace_tools.hooks as hooks +from tools.utils import run_cmd, mkdir, rel_path, ToolException, NotSupportedException, split_path +from tools.settings import BUILD_OPTIONS, MBED_ORG_USER +import tools.hooks as hooks #Disables multiprocessing if set to higher number than the host machine CPUs @@ -749,9 +749,9 @@ class mbedToolchain: def var(self, key, value): self.notify({'type': 'var', 'key': key, 'val': value}) -from workspace_tools.settings import ARM_BIN -from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH -from workspace_tools.settings import IAR_PATH +from tools.settings import ARM_BIN +from tools.settings import GCC_ARM_PATH, GCC_CR_PATH +from tools.settings import IAR_PATH TOOLCHAIN_BIN_PATH = { 'ARM': ARM_BIN, @@ -761,9 +761,9 @@ TOOLCHAIN_BIN_PATH = { 'IAR': IAR_PATH } -from workspace_tools.toolchains.arm import ARM_STD, ARM_MICRO -from workspace_tools.toolchains.gcc import GCC_ARM, GCC_CR -from workspace_tools.toolchains.iar import IAR +from tools.toolchains.arm import ARM_STD, ARM_MICRO +from tools.toolchains.gcc import GCC_ARM, GCC_CR +from tools.toolchains.iar import IAR TOOLCHAIN_CLASSES = { 'ARM': ARM_STD, diff --git a/workspace_tools/toolchains/arm.py b/tools/toolchains/arm.py similarity index 96% rename from workspace_tools/toolchains/arm.py rename to tools/toolchains/arm.py index 447cabbfee..e624fcfc56 100644 --- a/workspace_tools/toolchains/arm.py +++ b/tools/toolchains/arm.py @@ -9,7 +9,7 @@ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, +distributed under the License is distributed on an "AS IS" tools., WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. @@ -18,10 +18,10 @@ import re from os.path import join import copy -from workspace_tools.toolchains import mbedToolchain -from workspace_tools.settings import ARM_BIN, ARM_INC, ARM_LIB, MY_ARM_CLIB, ARM_CPPLIB -from workspace_tools.hooks import hook_tool -from workspace_tools.settings import GOANNA_PATH +from tools.toolchains import mbedToolchain +from tools.settings import ARM_BIN, ARM_INC, ARM_LIB, MY_ARM_CLIB, ARM_CPPLIB +from tools.hooks import hook_tool +from tools.settings import GOANNA_PATH class ARM(mbedToolchain): LINKER_EXT = '.sct' diff --git a/workspace_tools/toolchains/gcc.py b/tools/toolchains/gcc.py similarity index 97% rename from workspace_tools/toolchains/gcc.py rename to tools/toolchains/gcc.py index a6cb063335..a6336b59d1 100644 --- a/workspace_tools/toolchains/gcc.py +++ b/tools/toolchains/gcc.py @@ -17,10 +17,10 @@ limitations under the License. import re from os.path import join, basename, splitext -from workspace_tools.toolchains import mbedToolchain -from workspace_tools.settings import GCC_ARM_PATH, GCC_CR_PATH -from workspace_tools.settings import GOANNA_PATH -from workspace_tools.hooks import hook_tool +from tools.toolchains import mbedToolchain +from tools.settings import GCC_ARM_PATH, GCC_CR_PATH +from tools.settings import GOANNA_PATH +from tools.hooks import hook_tool class GCC(mbedToolchain): LINKER_EXT = '.ld' diff --git a/workspace_tools/toolchains/iar.py b/tools/toolchains/iar.py similarity index 96% rename from workspace_tools/toolchains/iar.py rename to tools/toolchains/iar.py index aba1dd7f71..025503eb9f 100644 --- a/workspace_tools/toolchains/iar.py +++ b/tools/toolchains/iar.py @@ -18,10 +18,10 @@ import re from os import remove from os.path import join, exists -from workspace_tools.toolchains import mbedToolchain -from workspace_tools.settings import IAR_PATH -from workspace_tools.settings import GOANNA_PATH -from workspace_tools.hooks import hook_tool +from tools.toolchains import mbedToolchain +from tools.settings import IAR_PATH +from tools.settings import GOANNA_PATH +from tools.hooks import hook_tool class IAR(mbedToolchain): LIBRARY_EXT = '.a' diff --git a/workspace_tools/upload_results.py b/tools/upload_results.py similarity index 100% rename from workspace_tools/upload_results.py rename to tools/upload_results.py diff --git a/workspace_tools/utils.py b/tools/utils.py similarity index 100% rename from workspace_tools/utils.py rename to tools/utils.py