Merge pull request #10358 from Mytherin/rcfix

Ensure version numbers passed to Windows .rc file are numbers
duckdb · Jan 26, 2024 · 7a166b2 · 7a166b2
2 parents 172760f + 0a6edb3
commit 7a166b2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
@@ -151,7 +151,7 @@ jobs:
         run: >
           python scripts/windows_ci.py
 
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_GENERATOR_PLATFORM=x64 -DJDBC_DRIVER=1 -DBUILD_EXTENSIONS=json -DENABLE_EXTENSION_AUTOLOADING=1 -DENABLE_EXTENSION_AUTOINSTALL=1
+          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_GENERATOR_PLATFORM=x64 -DJDBC_DRIVER=1 -DBUILD_EXTENSIONS=json -DENABLE_EXTENSION_AUTOLOADING=1 -DENABLE_EXTENSION_AUTOINSTALL=1 -DBUILD_SHELL=0
 
           cmake --build . --config Release
       - name: Java Tests

diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
@@ -24,18 +24,39 @@ if(NOT AMALGAMATION_BUILD AND NOT WIN32)
   target_link_libraries(shell duckdb_utf8proc)
 endif()
 
+function(ensure_variable_is_number INPUT_VERSION OUT_RESULT)
+  if(NOT "${${INPUT_VERSION}}" MATCHES "^[0-9]+$")
+    message(
+      WARNING
+        "VERSION PARAMETER ${INPUT_VERSION} \"${${INPUT_VERSION}}\" IS NOT A NUMBER - SETTING TO 0"
+    )
+    set(${OUT_RESULT}
+        0
+        PARENT_SCOPE)
+  else()
+    set(${OUT_RESULT}
+        ${${INPUT_VERSION}}
+        PARENT_SCOPE)
+  endif()
+endfunction()
+
 if(WIN32 AND NOT MINGW)
   string(TIMESTAMP DUCKDB_COPYRIGHT_YEAR "%Y")
+  ensure_variable_is_number(DUCKDB_MAJOR_VERSION RC_MAJOR_VERSION)
+  ensure_variable_is_number(DUCKDB_MINOR_VERSION RC_MINOR_VERSION)
+  ensure_variable_is_number(DUCKDB_PATCH_VERSION RC_PATCH_VERSION)
+  ensure_variable_is_number(DUCKDB_DEV_ITERATION RC_DEV_ITERATION)
+
   set(CMAKE_RC_FLAGS
       "${CMAKE_RC_FLAGS} -D DUCKDB_VERSION=\"${DUCKDB_VERSION}\"")
   set(CMAKE_RC_FLAGS
-      "${CMAKE_RC_FLAGS} -D DUCKDB_MAJOR_VERSION=\"${DUCKDB_MAJOR_VERSION}\"")
+      "${CMAKE_RC_FLAGS} -D DUCKDB_MAJOR_VERSION=\"${RC_MAJOR_VERSION}\"")
   set(CMAKE_RC_FLAGS
-      "${CMAKE_RC_FLAGS} -D DUCKDB_MINOR_VERSION=\"${DUCKDB_MINOR_VERSION}\"")
+      "${CMAKE_RC_FLAGS} -D DUCKDB_MINOR_VERSION=\"${RC_MINOR_VERSION}\"")
   set(CMAKE_RC_FLAGS
-      "${CMAKE_RC_FLAGS} -D DUCKDB_PATCH_VERSION=\"${DUCKDB_PATCH_VERSION}\"")
+      "${CMAKE_RC_FLAGS} -D DUCKDB_PATCH_VERSION=\"${RC_PATCH_VERSION}\"")
   set(CMAKE_RC_FLAGS
-      "${CMAKE_RC_FLAGS} -D DUCKDB_DEV_ITERATION=\"${DUCKDB_DEV_ITERATION}\"")
+      "${CMAKE_RC_FLAGS} -D DUCKDB_DEV_ITERATION=\"${RC_DEV_ITERATION}\"")
   set(CMAKE_RC_FLAGS
       "${CMAKE_RC_FLAGS} -D DUCKDB_COPYRIGHT_YEAR=\"${DUCKDB_COPYRIGHT_YEAR}\"")
   target_sources(shell PRIVATE rc/duckdb.rc)