From eeed74e697c7ad2b568edef36dd2e0b86f4b36f5 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sat, 9 Sep 2023 21:00:30 +0200 Subject: [PATCH] Fix `prepare_release.sh -u` with CMakeLists.txt We want to keep GEN_FILES defaulting off on Windows. Signed-off-by: Gilles Peskine --- CMakeLists.txt | 3 ++- scripts/prepare_release.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d7e0b055d..a99ca38b1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,8 @@ option(ENABLE_PROGRAMS "Build mbed TLS programs." ON) option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF) option(MBEDTLS_FATAL_WARNINGS "Compiler warnings treated as errors" ON) if(CMAKE_HOST_WIN32) - option(GEN_FILES "Generate the auto-generated files as needed" OFF) + # N.B. The comment on the next line is significant for prepare_release.sh + option(GEN_FILES "Generate the auto-generated files as needed" OFF) # off in development else() option(GEN_FILES "Generate the auto-generated files as needed" ON) endif() diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh index 9013cc8788..800383d2ca 100755 --- a/scripts/prepare_release.sh +++ b/scripts/prepare_release.sh @@ -79,4 +79,4 @@ if [ -n "$unrelease" ]; then else r='OFF' fi -sed -i 's/^\( *option *( *GEN_FILES *"[^"]*" *\)\([A-Za-z0-9][A-Za-z0-9]*\)/\1'"$r/" CMakeLists.txt +sed -i '/[Oo][Ff][Ff] in development/! s/^\( *option *( *GEN_FILES *"[^"]*" *\)\([A-Za-z0-9][A-Za-z0-9]*\)/\1'"$r/" CMakeLists.txt