Add find program for python scripts

Author: multiplemonomials

tools/cmake/mbed-run-greentea-test.in.cmake

@@ -14,8 +14,8 @@ set(MBEDHTRUN_ARGS --skip-flashing @MBED_HTRUN_ARGUMENTS@) # filled in by config
 
 # Print out command
 string(REPLACE ";" " " MBEDHTRUN_ARGS_FOR_DISPLAY "${MBEDHTRUN_ARGS}")
-message("Executing: mbedhtrun ${MBEDHTRUN_ARGS_FOR_DISPLAY}")
+message("Executing: @mbedhtrun@ ${MBEDHTRUN_ARGS_FOR_DISPLAY}")
 
 execute_process(
-	COMMAND mbedhtrun ${MBEDHTRUN_ARGS}
+	COMMAND @mbedhtrun@ ${MBEDHTRUN_ARGS}
 	COMMAND_ERROR_IS_FATAL ANY)

tools/cmake/mbed_generate_configuration.cmake

@@ -82,7 +82,7 @@ if(MBED_NEED_TO_RECONFIGURE)
     # Make sure an old config file doesn't stick around
     file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake)
 
-    set(MBEDTOOLS_CONFIGURE_COMMAND mbed-tools
+    set(MBEDTOOLS_CONFIGURE_COMMAND ${mbed_tools}
         -v -v # without at least -v, warnings (e.g. "you have tried to override a nonexistent parameter") do not get printed
         configure
         -t GCC_ARM # GCC_ARM is currently the only supported toolchain
@@ -104,7 +104,7 @@ if(MBED_NEED_TO_RECONFIGURE)
 
     if((NOT MBEDTOOLS_CONFIGURE_RESULT EQUAL 0) OR (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/mbed_config.cmake))
         string(JOIN " " MBEDTOOLS_COMMAND_SPC_SEP ${MBEDTOOLS_CONFIGURE_COMMAND})
-        message(FATAL_ERROR "mbedtools configure failed!  Cannot build this project. Command was ${MBEDTOOLS_COMMAND_SPC_SEP} [note that you need to activate the Mbed OS virtualenv to run this command]")
+        message(FATAL_ERROR "mbedtools configure failed!  Cannot build this project. Command was ${MBEDTOOLS_COMMAND_SPC_SEP}")
     endif()
 
 endif()

tools/cmake/mbed_python_interpreter.cmake

@@ -41,8 +41,13 @@ if(MBED_CREATE_PYTHON_VENV)
         unset(_Python3_INTERPRETER_PROPERTIES CACHE)
         unset(_Python3_INTERPRETER_SIGNATURE CACHE)
         set (Python3_FIND_VIRTUALENV STANDARD)
+        unset(ENV{VIRTUAL_ENV})
         find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
+        # Reset venv configuration as above
+        set(Python3_FIND_VIRTUALENV FIRST)
+        set(ENV{VIRTUAL_ENV} ${MBED_VENV_LOCATION})
+
         set(NEED_TO_CREATE_VENV TRUE)
         set(NEED_TO_INSTALL_PACKAGES TRUE)
     elseif(NOT EXISTS "${VENV_STAMP_FILE}")
@@ -102,10 +107,31 @@ else()
 
     # The cmsis_mcu_descr module was written from scratch by Mbed CE.
     # So, this check will ensure that the user has installed the Mbed CE version of mbed_tools
-    # and not the PyPI version (which we cannot do anything with because it's owned by ARM)
+    # and not the PyPI version (which we cannot update because it's owned by ARM)
     check_python_package(mbed_tools.cli.cmsis_mcu_descr HAVE_MBED_CE_TOOLS)
 
     if(NOT HAVE_MBED_CE_TOOLS)
         message(FATAL_ERROR "Did not detect the Mbed CE Python tools installed into the python interpreter ${Python3_EXECUTABLE}. Install them with a command like: ${Python3_EXECUTABLE} -m pip install -e ${MBED_CE_TOOLS_BASE_DIR}")
     endif()
 endif()
+
+get_filename_component(PYTHON3_INTERP_DIR ${Python3_EXECUTABLE} DIRECTORY)
+
+# Find scripts provided by the Python package
+find_program(mbed_tools
+    NAMES mbed-tools
+    HINTS ${PYTHON3_INTERP_DIR}
+    DOC "Path to mbed-tools Python script."
+    REQUIRED)
+
+find_program(mbedhtrun
+    NAMES mbedhtrun
+    HINTS ${PYTHON3_INTERP_DIR}
+    DOC "Path to mbedhtrun Python script."
+    REQUIRED)
+
+find_program(memap
+        NAMES memap
+        HINTS ${PYTHON3_INTERP_DIR}
+        DOC "Path to memap Python script."
+        REQUIRED)

tools/cmake/mbed_target_functions.cmake

@@ -65,12 +65,12 @@ function(mbed_generate_map_file target)
         TARGET
             ${target}
         POST_BUILD
-        COMMAND ${Python3_EXECUTABLE} -m memap.memap
-            -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map 
+        COMMAND ${memap}
+            -t ${MBED_TOOLCHAIN} ${target}${CMAKE_EXECUTABLE_SUFFIX}.map
             --depth ${MBED_MEMAP_DEPTH}
             ${MEMORY_BANKS_ARG}
         WORKING_DIRECTORY
-			${mbed-os_SOURCE_DIR}/tools/python
+            ${CMAKE_CURRENT_BINARY_DIR}
     )
 
     # generate json file
@@ -79,14 +79,14 @@ function(mbed_generate_map_file target)
             TARGET
                 ${target}
             POST_BUILD
-            COMMAND ${Python3_EXECUTABLE} -m memap.memap
-            -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map 
+            COMMAND ${memap}
+            -t ${MBED_TOOLCHAIN} ${target}${CMAKE_EXECUTABLE_SUFFIX}.map
             --depth ${MBED_MEMAP_DEPTH} 
             -e json
-            -o ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.memmap.json
+            -o ${target}${CMAKE_EXECUTABLE_SUFFIX}.memmap.json
             ${MEMORY_BANKS_ARG}
             WORKING_DIRECTORY
-			    ${mbed-os_SOURCE_DIR}/tools/python
+                ${CMAKE_CURRENT_BINARY_DIR}
     )
     endif()
 
@@ -96,14 +96,14 @@ function(mbed_generate_map_file target)
             TARGET
                 ${target}
             POST_BUILD
-            COMMAND ${Python3_EXECUTABLE} -m memap.memap
-            -t ${MBED_TOOLCHAIN} ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map 
+            COMMAND ${memap}
+            -t ${MBED_TOOLCHAIN} ${target}${CMAKE_EXECUTABLE_SUFFIX}.map
             --depth ${MBED_MEMAP_DEPTH} 
             -e html
-            -o ${CMAKE_CURRENT_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.memmap.html
+            -o ${target}${CMAKE_EXECUTABLE_SUFFIX}.memmap.html
             ${MEMORY_BANKS_ARG}
             WORKING_DIRECTORY
-			    ${mbed-os_SOURCE_DIR}/tools/python
+                ${CMAKE_CURRENT_BINARY_DIR}
     )
     endif()
 endfunction()