From b5d073a2ad71862e9ed740dfcf7e1069f53485b0 Mon Sep 17 00:00:00 2001 From: "P. J. McDermott" Date: Tue, 30 Jan 2024 06:29:51 -0500 Subject: [PATCH] Rename src/lua/*.h to src/lua/wrapper_*.h These will be changed to conditionally include system Lua headers, e.g. "lua.h", instead of submodule Lua headers, e.g. "module/lua/lua.h". If a header named "lua.h" includes "lua.h", the build will fail due to recursion. This can't be solved using angle brackets to include system headers, because macos builds won't find them: In file included from /Users/runner/work/wesnoth/wesnoth/src/ai/registry.cpp:30: In file included from /Users/runner/work/wesnoth/wesnoth/src/ai/composite/aspect.hpp:24: In file included from /Users/runner/work/wesnoth/wesnoth/src/ai/lua/lua_object.hpp:25: /Users/runner/work/wesnoth/wesnoth/src/lua/lua.h:4:14: error: 'lua.h' file not found with include; use "quotes" instead #include ^~~~~~~ "lua.h" Renamed with (requires GNU sed): $ for f in src/lua/*.h; do > git mv "${f}" "src/lua/wrapper_${f#src/lua/}"; > done $ git grep -El -- '#[ \t]*include[ \t]+"lua/[^"]+[.]h"' src | \ > xargs sed -Ei -- ' > s|(#[ \t]*include[ \t]+"lua/)(lua[.]h")( )?|\1wrapper_\2|; > s|(#[ \t]*include[ \t]+"lua/)(lualib[.]h")( )?|\1wrapper_\2|; > s|(#[ \t]*include[ \t]+"lua/)(lauxlib[.]h")( )?|\1wrapper_\2|; > ' --- src/ai/default/aspect_attacks.cpp | 2 +- src/ai/lua/aspect_advancements.cpp | 2 +- src/ai/lua/core.cpp | 2 +- src/ai/lua/lua_object.cpp | 2 +- src/ai/lua/lua_object.hpp | 2 +- src/build_info.cpp | 2 +- src/lua/{lauxlib.h => wrapper_lauxlib.h} | 0 src/lua/{lua.h => wrapper_lua.h} | 0 src/lua/{lualib.h => wrapper_lualib.h} | 0 src/scripting/application_lua_kernel.cpp | 2 +- src/scripting/debug_lua.hpp | 2 +- src/scripting/game_lua_kernel.cpp | 2 +- src/scripting/lua_audio.cpp | 2 +- src/scripting/lua_color.cpp | 2 +- src/scripting/lua_common.cpp | 2 +- src/scripting/lua_cpp_function.cpp | 2 +- src/scripting/lua_formula_bridge.cpp | 2 +- src/scripting/lua_gui2.cpp | 2 +- src/scripting/lua_kernel_base.cpp | 4 ++-- src/scripting/lua_map_location_ops.cpp | 2 +- src/scripting/lua_mathx.cpp | 2 +- src/scripting/lua_pathfind_cost_calculator.hpp | 2 +- src/scripting/lua_preferences.cpp | 2 +- src/scripting/lua_race.cpp | 2 +- src/scripting/lua_rng.cpp | 2 +- src/scripting/lua_stringx.cpp | 2 +- src/scripting/lua_team.cpp | 2 +- src/scripting/lua_terrainfilter.cpp | 2 +- src/scripting/lua_terrainmap.cpp | 2 +- src/scripting/lua_unit.cpp | 2 +- src/scripting/lua_unit_attacks.cpp | 2 +- src/scripting/lua_unit_type.cpp | 2 +- src/scripting/lua_widget.cpp | 2 +- src/scripting/lua_widget_attributes.cpp | 2 +- src/scripting/lua_widget_methods.cpp | 2 +- src/scripting/lua_wml.cpp | 2 +- src/scripting/mapgen_lua_kernel.cpp | 2 +- src/scripting/push_check.hpp | 2 +- 38 files changed, 36 insertions(+), 36 deletions(-) rename src/lua/{lauxlib.h => wrapper_lauxlib.h} (100%) rename src/lua/{lua.h => wrapper_lua.h} (100%) rename src/lua/{lualib.h => wrapper_lualib.h} (100%) diff --git a/src/ai/default/aspect_attacks.cpp b/src/ai/default/aspect_attacks.cpp index eb62ed1c54a..ebce9a03f90 100644 --- a/src/ai/default/aspect_attacks.cpp +++ b/src/ai/default/aspect_attacks.cpp @@ -24,7 +24,7 @@ #include "ai/manager.hpp" #include "game_board.hpp" #include "log.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "map/map.hpp" #include "pathfind/pathfind.hpp" #include "resources.hpp" diff --git a/src/ai/lua/aspect_advancements.cpp b/src/ai/lua/aspect_advancements.cpp index dfb2bf7094e..29411de0085 100644 --- a/src/ai/lua/aspect_advancements.cpp +++ b/src/ai/lua/aspect_advancements.cpp @@ -16,7 +16,7 @@ #include "ai/lua/aspect_advancements.hpp" #include "log.hpp" // for LOG_STREAM, logger, etc -#include "lua/lauxlib.h" // for luaL_ref, LUA_REFNIL, lua_isstring, etc +#include "lua/wrapper_lauxlib.h" // for luaL_ref, LUA_REFNIL, lua_isstring, etc #include "map/location.hpp" // for map_location #include "serialization/string_utils.hpp" // for split #include "units/unit.hpp" diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index 906a28132c1..0f8ff543c2c 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -44,7 +44,7 @@ #include "ai/composite/contexts.hpp" #include "ai/default/aspect_attacks.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static lg::log_domain log_ai_engine_lua("ai/engine/lua"); #define LOG_LUA LOG_STREAM(info, log_ai_engine_lua) diff --git a/src/ai/lua/lua_object.cpp b/src/ai/lua/lua_object.cpp index 6ad9c0909ff..3c0a1a23eaa 100644 --- a/src/ai/lua/lua_object.cpp +++ b/src/ai/lua/lua_object.cpp @@ -24,7 +24,7 @@ #include "scripting/lua_common.hpp" #include "resources.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" namespace ai { diff --git a/src/ai/lua/lua_object.hpp b/src/ai/lua/lua_object.hpp index f2c3fbb47c9..7601b849ebe 100644 --- a/src/ai/lua/lua_object.hpp +++ b/src/ai/lua/lua_object.hpp @@ -22,7 +22,7 @@ #include "config.hpp" #include "log.hpp" -#include "lua/lua.h" +#include "lua/wrapper_lua.h" #include "map/location.hpp" #include "resources.hpp" #include "scripting/lua_common.hpp" diff --git a/src/build_info.cpp b/src/build_info.cpp index 6f2eb2b9570..d3cbbeb4461 100644 --- a/src/build_info.cpp +++ b/src/build_info.cpp @@ -34,7 +34,7 @@ #include #include -#include "lua/lua.h" +#include "lua/wrapper_lua.h" #include #include diff --git a/src/lua/lauxlib.h b/src/lua/wrapper_lauxlib.h similarity index 100% rename from src/lua/lauxlib.h rename to src/lua/wrapper_lauxlib.h diff --git a/src/lua/lua.h b/src/lua/wrapper_lua.h similarity index 100% rename from src/lua/lua.h rename to src/lua/wrapper_lua.h diff --git a/src/lua/lualib.h b/src/lua/wrapper_lualib.h similarity index 100% rename from src/lua/lualib.h rename to src/lua/wrapper_lualib.h diff --git a/src/scripting/application_lua_kernel.cpp b/src/scripting/application_lua_kernel.cpp index d7bfef6dd20..d9b5345066f 100644 --- a/src/scripting/application_lua_kernel.cpp +++ b/src/scripting/application_lua_kernel.cpp @@ -50,7 +50,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" struct lua_State; diff --git a/src/scripting/debug_lua.hpp b/src/scripting/debug_lua.hpp index e9870462d72..cae8e91f9ae 100644 --- a/src/scripting/debug_lua.hpp +++ b/src/scripting/debug_lua.hpp @@ -17,7 +17,7 @@ #pragma once -#include "lua/lualib.h" +#include "lua/wrapper_lualib.h" void ds(lua_State *L, const bool verbose_table = true); diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 321926fc11e..2b940b06b24 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -126,7 +126,7 @@ #include #include // for vector, etc #include // for SDL_GetTicks -#include "lua/lauxlib.h" // for luaL_checkinteger, lua_setfield, etc +#include "lua/wrapper_lauxlib.h" // for luaL_checkinteger, lua_setfield, etc #ifdef DEBUG_LUA #include "scripting/debug_lua.hpp" diff --git a/src/scripting/lua_audio.cpp b/src/scripting/lua_audio.cpp index dc5f68c47bd..2a497ea729f 100644 --- a/src/scripting/lua_audio.cpp +++ b/src/scripting/lua_audio.cpp @@ -15,7 +15,7 @@ #include "lua_audio.hpp" #include "log.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "scripting/lua_common.hpp" #include "scripting/push_check.hpp" #include "sound.hpp" diff --git a/src/scripting/lua_color.cpp b/src/scripting/lua_color.cpp index f4a875eab7b..a7e6fde63a2 100644 --- a/src/scripting/lua_color.cpp +++ b/src/scripting/lua_color.cpp @@ -16,7 +16,7 @@ #include "scripting/lua_color.hpp" #include "scripting/lua_common.hpp" #include "scripting/push_check.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "log.hpp" #include "game_config.hpp" diff --git a/src/scripting/lua_common.cpp b/src/scripting/lua_common.cpp index f98e6616de8..ac5d73d5fc3 100644 --- a/src/scripting/lua_common.cpp +++ b/src/scripting/lua_common.cpp @@ -39,7 +39,7 @@ #include // for operator new #include // for string, basic_string -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static const char gettextKey[] = "gettext"; static const char vconfigKey[] = "vconfig"; diff --git a/src/scripting/lua_cpp_function.cpp b/src/scripting/lua_cpp_function.cpp index 5f5023db353..d39603f3612 100644 --- a/src/scripting/lua_cpp_function.cpp +++ b/src/scripting/lua_cpp_function.cpp @@ -20,7 +20,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "scripting/lua_common.hpp" // for new(L) static lg::log_domain log_scripting_lua("scripting/lua"); diff --git a/src/scripting/lua_formula_bridge.cpp b/src/scripting/lua_formula_bridge.cpp index 36b734fa42a..9eef4eae0dd 100644 --- a/src/scripting/lua_formula_bridge.cpp +++ b/src/scripting/lua_formula_bridge.cpp @@ -21,7 +21,7 @@ #include "scripting/lua_team.hpp" #include "scripting/lua_unit_attacks.hpp" #include "scripting/lua_unit_type.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "formula/callable_objects.hpp" #include "formula/formula.hpp" #include "variable.hpp" diff --git a/src/scripting/lua_gui2.cpp b/src/scripting/lua_gui2.cpp index 8d2366fd759..e76e37c4c0c 100644 --- a/src/scripting/lua_gui2.cpp +++ b/src/scripting/lua_gui2.cpp @@ -50,7 +50,7 @@ #include #include -#include "lua/lauxlib.h" // for luaL_checkinteger, lua_setfield, etc +#include "lua/wrapper_lauxlib.h" // for luaL_checkinteger, lua_setfield, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_kernel_base.cpp b/src/scripting/lua_kernel_base.cpp index 9b4b77d15bc..495abd42699 100644 --- a/src/scripting/lua_kernel_base.cpp +++ b/src/scripting/lua_kernel_base.cpp @@ -59,8 +59,8 @@ #include #include -#include "lua/lauxlib.h" -#include "lua/lualib.h" +#include "lua/wrapper_lauxlib.h" +#include "lua/wrapper_lualib.h" static lg::log_domain log_scripting_lua("scripting/lua"); static lg::log_domain log_user("scripting/lua/user"); diff --git a/src/scripting/lua_map_location_ops.cpp b/src/scripting/lua_map_location_ops.cpp index 03d5c8e0e20..8b5d7e85c8c 100644 --- a/src/scripting/lua_map_location_ops.cpp +++ b/src/scripting/lua_map_location_ops.cpp @@ -23,7 +23,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" namespace lua_map_location { diff --git a/src/scripting/lua_mathx.cpp b/src/scripting/lua_mathx.cpp index f542670b9a1..0bbbb420f1b 100644 --- a/src/scripting/lua_mathx.cpp +++ b/src/scripting/lua_mathx.cpp @@ -19,7 +19,7 @@ #include "random.hpp" #include "SDL2/SDL_timer.h" // for SDL_GetTicks -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include #include diff --git a/src/scripting/lua_pathfind_cost_calculator.hpp b/src/scripting/lua_pathfind_cost_calculator.hpp index d2be24c098b..03bca209811 100644 --- a/src/scripting/lua_pathfind_cost_calculator.hpp +++ b/src/scripting/lua_pathfind_cost_calculator.hpp @@ -14,7 +14,7 @@ #pragma once -#include "lua/lua.h" +#include "lua/wrapper_lua.h" #include "map/location.hpp" #include "pathfind/pathfind.hpp" diff --git a/src/scripting/lua_preferences.cpp b/src/scripting/lua_preferences.cpp index 21d78cb57f1..439e12e1d5e 100644 --- a/src/scripting/lua_preferences.cpp +++ b/src/scripting/lua_preferences.cpp @@ -16,7 +16,7 @@ #include "scripting/lua_preferences.hpp" #include "config.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "preferences/advanced.hpp" #include "preferences/general.hpp" #include "scripting/lua_common.hpp" diff --git a/src/scripting/lua_race.cpp b/src/scripting/lua_race.cpp index b63bbad5361..b12804835c1 100644 --- a/src/scripting/lua_race.cpp +++ b/src/scripting/lua_race.cpp @@ -23,7 +23,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" /** * Implementation for a lua reference to a race, diff --git a/src/scripting/lua_rng.cpp b/src/scripting/lua_rng.cpp index 7245d46bfd4..5013b4900d9 100644 --- a/src/scripting/lua_rng.cpp +++ b/src/scripting/lua_rng.cpp @@ -23,7 +23,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static lg::log_domain log_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_lua) diff --git a/src/scripting/lua_stringx.cpp b/src/scripting/lua_stringx.cpp index 24604ae1516..b0c11349e54 100644 --- a/src/scripting/lua_stringx.cpp +++ b/src/scripting/lua_stringx.cpp @@ -23,7 +23,7 @@ #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" namespace lua_stringx { diff --git a/src/scripting/lua_team.cpp b/src/scripting/lua_team.cpp index 7fa428a918a..5d82ecde94c 100644 --- a/src/scripting/lua_team.cpp +++ b/src/scripting/lua_team.cpp @@ -26,7 +26,7 @@ #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" /** * Implementation for a lua reference to a team, diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp index e90f7d2129e..6af570948ad 100644 --- a/src/scripting/lua_terrainfilter.cpp +++ b/src/scripting/lua_terrainfilter.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static lg::log_domain log_scripting_lua_mapgen("scripting/lua/mapgen"); #define LOG_LMG LOG_STREAM(info, log_scripting_lua_mapgen) diff --git a/src/scripting/lua_terrainmap.cpp b/src/scripting/lua_terrainmap.cpp index 191e7cd2485..76516679140 100644 --- a/src/scripting/lua_terrainmap.cpp +++ b/src/scripting/lua_terrainmap.cpp @@ -27,7 +27,7 @@ #include "game_board.hpp" #include "play_controller.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define LOG_LUA LOG_STREAM(info, log_scripting_lua) diff --git a/src/scripting/lua_unit.cpp b/src/scripting/lua_unit.cpp index 2b2e7a1db64..d49e691a018 100644 --- a/src/scripting/lua_unit.cpp +++ b/src/scripting/lua_unit.cpp @@ -31,7 +31,7 @@ #include "game_version.hpp" #include "deprecation.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define LOG_LUA LOG_STREAM(info, log_scripting_lua) diff --git a/src/scripting/lua_unit_attacks.cpp b/src/scripting/lua_unit_attacks.cpp index 64d0d8c52fd..11f4b317369 100644 --- a/src/scripting/lua_unit_attacks.cpp +++ b/src/scripting/lua_unit_attacks.cpp @@ -24,7 +24,7 @@ #include "units/attack_type.hpp" #include "utils/const_clone.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include diff --git a/src/scripting/lua_unit_type.cpp b/src/scripting/lua_unit_type.cpp index 3818a4fe368..c5303c3b5c0 100644 --- a/src/scripting/lua_unit_type.cpp +++ b/src/scripting/lua_unit_type.cpp @@ -23,7 +23,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" /** * Implementation for a lua reference to a unit_type. diff --git a/src/scripting/lua_widget.cpp b/src/scripting/lua_widget.cpp index d921493feac..71be6a3c0b2 100644 --- a/src/scripting/lua_widget.cpp +++ b/src/scripting/lua_widget.cpp @@ -25,7 +25,7 @@ #include "scripting/push_check.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include diff --git a/src/scripting/lua_widget_attributes.cpp b/src/scripting/lua_widget_attributes.cpp index 259040f67c0..a8c0586b332 100644 --- a/src/scripting/lua_widget_attributes.cpp +++ b/src/scripting/lua_widget_attributes.cpp @@ -55,7 +55,7 @@ #include #include -#include "lua/lauxlib.h" // for luaL_checkinteger, lua_setfield, etc +#include "lua/wrapper_lauxlib.h" // for luaL_checkinteger, lua_setfield, etc static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_widget_methods.cpp b/src/scripting/lua_widget_methods.cpp index 249af1d547a..6579159ebba 100644 --- a/src/scripting/lua_widget_methods.cpp +++ b/src/scripting/lua_widget_methods.cpp @@ -51,7 +51,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" static lg::log_domain log_scripting_lua("scripting/lua"); #define ERR_LUA LOG_STREAM(err, log_scripting_lua) diff --git a/src/scripting/lua_wml.cpp b/src/scripting/lua_wml.cpp index 74baa4ce53f..2a5eb1fea97 100644 --- a/src/scripting/lua_wml.cpp +++ b/src/scripting/lua_wml.cpp @@ -25,7 +25,7 @@ #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" namespace lua_wml { diff --git a/src/scripting/mapgen_lua_kernel.cpp b/src/scripting/mapgen_lua_kernel.cpp index af482fda54d..5b5785adf07 100644 --- a/src/scripting/mapgen_lua_kernel.cpp +++ b/src/scripting/mapgen_lua_kernel.cpp @@ -30,7 +30,7 @@ #include #include -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "scripting/push_check.hpp" #include "generators/default_map_generator_job.hpp" diff --git a/src/scripting/push_check.hpp b/src/scripting/push_check.hpp index 593c6a558ee..1e739f6d9d3 100644 --- a/src/scripting/push_check.hpp +++ b/src/scripting/push_check.hpp @@ -17,7 +17,7 @@ #include "scripting/lua_common.hpp" #include "scripting/lua_widget.hpp" -#include "lua/lauxlib.h" +#include "lua/wrapper_lauxlib.h" #include "global.hpp" #include "tstring.hpp" #include "map/location.hpp"