From 5e765a2787adbfdebaa35cb4a82fdcfa4c0eaa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= <glx22@users.noreply.github.com>
Date: Sat, 24 May 2025 22:38:37 +0200
Subject: [PATCH] Codechange: [CMake] Use ".sq.hpp" instead of ".hpp.sq" for
 API exports (#14297)

---
 cmake/scripts/SquirrelExport.cmake                   |  6 +++---
 src/ai/ai_instance.cpp                               |  2 +-
 src/script/api/CMakeLists.txt                        | 12 ++++++------
 .../{ai_controller.hpp.sq => ai_controller.sq.hpp}   |  0
 ...game_controller.hpp.sq => game_controller.sq.hpp} |  0
 ...el_export.hpp.sq.in => squirrel_export.sq.hpp.in} |  0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename src/script/api/ai/{ai_controller.hpp.sq => ai_controller.sq.hpp} (100%)
 rename src/script/api/game/{game_controller.hpp.sq => game_controller.sq.hpp} (100%)
 rename src/script/api/{squirrel_export.hpp.sq.in => squirrel_export.sq.hpp.in} (100%)

diff --git a/cmake/scripts/SquirrelExport.cmake b/cmake/scripts/SquirrelExport.cmake
index d4e457861d..c2567ee1c4 100644
--- a/cmake/scripts/SquirrelExport.cmake
+++ b/cmake/scripts/SquirrelExport.cmake
@@ -17,11 +17,11 @@ if(NOT APILC)
 endif()
 
 macro(dump_fileheader)
-    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
-    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}\"")
+    get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME_WE)
+    string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}.hpp\"")
     if(NOT "${APIUC}" STREQUAL "Template")
         string(REPLACE "script_" "template_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
-        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq\"")
+        string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq.hpp\"")
     endif()
 endmacro()
 
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index dab386ff13..cb8a4a00b4 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -27,7 +27,7 @@
 #include "table/strings.h"
 
 /* Manually include the Text glue. */
-#include "../script/api/template/template_text.hpp.sq"
+#include "../script/api/template/template_text.sq.hpp"
 
 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.hpp"
diff --git a/src/script/api/CMakeLists.txt b/src/script/api/CMakeLists.txt
index f41efd068c..28fd71128a 100644
--- a/src/script/api/CMakeLists.txt
+++ b/src/script/api/CMakeLists.txt
@@ -43,23 +43,23 @@ foreach(API "ai;AI" "game;GS" "template;Template")
         if("${SCRIPT_API_FILE}" MATCHES ".*script_controller.*")
             continue()
         endif()
-        get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
+        get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME_WE)
         string(REPLACE "script_" "${APILC}_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
-        set(SCRIPT_API_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${SCRIPT_API_FILE_NAME}.sq")
+        set(SCRIPT_API_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${SCRIPT_API_FILE_NAME}.sq.hpp")
 
         add_custom_command_timestamp(OUTPUT ${SCRIPT_API_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND}
-                        -DSCRIPT_API_SOURCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.hpp.sq.in
+                        -DSCRIPT_API_SOURCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.sq.hpp.in
                         -DSCRIPT_API_BINARY_FILE=${SCRIPT_API_BINARY_FILE}
                         -DSCRIPT_API_FILE=${SCRIPT_API_FILE}
                         -DAPIUC=${APIUC}
                         -DAPILC=${APILC}
                         -P ${CMAKE_SOURCE_DIR}/cmake/scripts/SquirrelExport.cmake
                 MAIN_DEPENDENCY ${SCRIPT_API_FILE}
-                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.hpp.sq.in
+                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/squirrel_export.sq.hpp.in
                         ${CMAKE_SOURCE_DIR}/cmake/scripts/SquirrelExport.cmake
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                COMMENT "Generating ${APILC}/${SCRIPT_API_FILE_NAME}.sq"
+                COMMENT "Generating ${APILC}/${SCRIPT_API_FILE_NAME}.sq.hpp"
         )
         list(APPEND SCRIPT_${APIUC}_BINARY_FILES ${SCRIPT_API_BINARY_FILE})
     endforeach()
@@ -73,7 +73,7 @@ foreach(API "ai;AI" "game;GS" "template;Template")
     )
 
     if(NOT "${APILC}" STREQUAL "template")
-        list(APPEND SCRIPT_${APIUC}_BINARY_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${APILC}/${APILC}_controller.hpp.sq")
+        list(APPEND SCRIPT_${APIUC}_BINARY_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${APILC}/${APILC}_controller.sq.hpp")
         set(INCLUDES_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${APILC}_includes.hpp")
         set(API_FILES "${CMAKE_CURRENT_BINARY_DIR}/${APILC}.files")
         file(GENERATE OUTPUT ${API_FILES} CONTENT "${SCRIPT_${APIUC}_BINARY_FILES}")
diff --git a/src/script/api/ai/ai_controller.hpp.sq b/src/script/api/ai/ai_controller.sq.hpp
similarity index 100%
rename from src/script/api/ai/ai_controller.hpp.sq
rename to src/script/api/ai/ai_controller.sq.hpp
diff --git a/src/script/api/game/game_controller.hpp.sq b/src/script/api/game/game_controller.sq.hpp
similarity index 100%
rename from src/script/api/game/game_controller.hpp.sq
rename to src/script/api/game/game_controller.sq.hpp
diff --git a/src/script/api/squirrel_export.hpp.sq.in b/src/script/api/squirrel_export.sq.hpp.in
similarity index 100%
rename from src/script/api/squirrel_export.hpp.sq.in
rename to src/script/api/squirrel_export.sq.hpp.in