py/mkrules: Fix QSTR generation on windows.

GeorgeCGV · GeorgeCGV · commit 294d2c9c8c1b · 2022-11-29T16:01:58.000+01:00
Escapes `&lt;` and `&gt;` characters within `MP_CONFIGFILE`
define. That allows it to be used within generated
`cmd.exe /C` commands.

Applies only to builds on Windows.

Signed-off-by: Georgij Cernysiov &lt;geo.cgv@gmail.com&gt;
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
@@ -54,6 +54,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
 
 set(MP_QSTRDEFS_PREPROCESS_SED0 "s/^Q(.*)/\"&\"/")
 set(MP_QSTRDEFS_PREPROCESS_SED1 "s/^\\\"\\(Q(.*)\\)\\\"/\\1/")
+set(MP_CPP_FLAGS_ESCAPED ${MICROPY_CPP_FLAGS})
 
 if(CMAKE_HOST_WIN32)
     # On Windows piped commands fail when forward slash is used with executable.
@@ -67,6 +68,11 @@ if(CMAKE_HOST_WIN32)
     string(REPLACE "&" "^&" MP_QSTRDEFS_PREPROCESS_SED0 "${MP_QSTRDEFS_PREPROCESS_SED0}")
     string(REPLACE "^" "^^" MP_QSTRDEFS_PREPROCESS_SED1 "${MP_QSTRDEFS_PREPROCESS_SED1}")
     string(REPLACE "&" "^&" MP_QSTRDEFS_PREPROCESS_SED1 "${MP_QSTRDEFS_PREPROCESS_SED1}")
+    # Escape `<` and `>` in the -DMP_CONFIGFILE
+    # otherwise generated command is invalid for CMD
+    string(REGEX MATCH "-DMP_CONFIGFILE=<(.+h)>" MP_CONFIGFILE_DEF "${MP_CPP_FLAGS_ESCAPED}")
+    # provide input as a string to preserve ';'
+    string(REPLACE "-DMP_CONFIGFILE=<${CMAKE_MATCH_1}>" "-DMP_CONFIGFILE=^<${CMAKE_MATCH_1}^>" MP_CPP_FLAGS_ESCAPED "${MP_CPP_FLAGS_ESCAPED}")
 endif()
 
 # Command to force the build of another command
@@ -119,7 +125,7 @@ add_custom_command(
 
 add_custom_command(
     OUTPUT ${MICROPY_QSTRDEFS_PREPROCESSED}
-    COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_PORT} ${MICROPY_QSTRDEFS_COLLECTED} | sed ${MP_QSTRDEFS_PREPROCESS_SED0} | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed ${MP_QSTRDEFS_PREPROCESS_SED1} > ${MICROPY_QSTRDEFS_PREPROCESSED}
+    COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_PORT} ${MICROPY_QSTRDEFS_COLLECTED} | sed ${MP_QSTRDEFS_PREPROCESS_SED0} | ${CMAKE_C_COMPILER} -E ${MP_CPP_FLAGS_ESCAPED} - | sed ${MP_QSTRDEFS_PREPROCESS_SED1} > ${MICROPY_QSTRDEFS_PREPROCESSED}
     DEPENDS ${MICROPY_QSTRDEFS_PY}
         ${MICROPY_QSTRDEFS_PORT}
         ${MICROPY_QSTRDEFS_COLLECTED}
