Skip to content

Commit 869fdb1

Browse files
committed
py/mkrules: fix sed escape for windows.
Escapes `^`, `&` in sed expressions. Signed-off-by: Georgij Cernysiov <geo.cgv@gmail.com>
1 parent bdbc444 commit 869fdb1

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

py/mkrules.cmake

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ set(MICROPY_ROOT_POINTERS_SPLIT "${MICROPY_GENHDR_DIR}/root_pointers.split")
1515
set(MICROPY_ROOT_POINTERS_COLLECTED "${MICROPY_GENHDR_DIR}/root_pointers.collected")
1616
set(MICROPY_ROOT_POINTERS "${MICROPY_GENHDR_DIR}/root_pointers.h")
1717

18+
if(CMAKE_HOST_WIN32)
19+
# CMD requires additional escapes for CMD
20+
set(MICROPY_QSTRDEFS_PREPROCESS_SED0 "s/^^Q(.*)/\"^&\"/")
21+
set(MICROPY_QSTRDEFS_PREPROCESS_SED1 "s/^^\\\"\\(Q(.*)\\)\\\"/\\1/")
22+
else()
23+
set(MICROPY_QSTRDEFS_PREPROCESS_SED0 "s/^Q(.*)/\"&\"/")
24+
set(MICROPY_QSTRDEFS_PREPROCESS_SED1 "s/^\\\"\\(Q(.*)\\)\\\"/\\1/")
25+
endif()
26+
1827
# Need to do this before extracting MICROPY_CPP_DEF below. Rest of frozen
1928
# manifest handling is at the end of this file.
2029
if(MICROPY_FROZEN_MANIFEST)
@@ -102,7 +111,7 @@ add_custom_command(
102111

103112
add_custom_command(
104113
OUTPUT ${MICROPY_QSTRDEFS_PREPROCESSED}
105-
COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_PORT} ${MICROPY_QSTRDEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTRDEFS_PREPROCESSED}
114+
COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_PORT} ${MICROPY_QSTRDEFS_COLLECTED} | sed ${MICROPY_QSTRDEFS_PREPROCESS_SED0} | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed ${MICROPY_QSTRDEFS_PREPROCESS_SED1} > ${MICROPY_QSTRDEFS_PREPROCESSED}
106115
DEPENDS ${MICROPY_QSTRDEFS_PY}
107116
${MICROPY_QSTRDEFS_PORT}
108117
${MICROPY_QSTRDEFS_COLLECTED}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy