Repository.mk | 2 +- bridges/CustomTarget_gcc3_wasm.mk | 5 +++-- solenv/gbuild/extensions/pre_BuildTools.mk | 2 +- static/Executable_wasmbridgegen.mk | 10 +++++----- static/Module_static.mk | 2 +- static/source/wasmbridgegen/wasmbridgegen.cxx | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-)
New commits: commit 69fc5c396059603804b17b0f0cb076fff7188cba Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Jul 11 16:41:38 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Jul 11 21:46:03 2024 +0200 Rename wasmcallgen -> wasmbridgegen ...to acknowledge the tools' more general role since 74829f2a64b6989ddf1d126a6fd2f2d2e9000d3b "Fully implement the Wasm UNO bridge cpp2uno direction" Change-Id: Ie89255579774035f7b726d1d4b029dc536893ca0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170382 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Jenkins diff --git a/Repository.mk b/Repository.mk index 70af3dac3916..f4e11b0193a5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ concat-deps \ cpp \ cppunittester \ - $(if $(or $(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),$(filter EMSCRIPTEN,$(OS))),embindmaker wasmcallgen) \ + $(if $(or $(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),$(filter EMSCRIPTEN,$(OS))),embindmaker wasmbridgegen) \ gbuildtojson \ $(if $(filter MSC,$(COM)), \ gcc-wrapper \ diff --git a/bridges/CustomTarget_gcc3_wasm.mk b/bridges/CustomTarget_gcc3_wasm.mk index 0393b1b8193b..15506e0d124b 100644 --- a/bridges/CustomTarget_gcc3_wasm.mk +++ b/bridges/CustomTarget_gcc3_wasm.mk @@ -18,9 +18,10 @@ $(eval $(call gb_CustomTarget_register_targets,bridges/gcc3_wasm, \ $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/generated-asm.s \ $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/generated-cxx.cxx \ $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/exports: \ - $(call gb_Executable_get_target_for_build,wasmcallgen) $(call gb_UnoApi_get_target,udkapi) \ + $(call gb_Executable_get_target_for_build,wasmbridgegen) \ + $(call gb_UnoApi_get_target,udkapi) \ $(call gb_UnoApi_get_target,offapi) - $(call gb_Executable_get_command,wasmcallgen) \ + $(call gb_Executable_get_command,wasmbridgegen) \ $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/generated-cxx.cxx \ $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/generated-asm.s \ $(gb_CustomTarget_workdir)/bridges/gcc3_wasm/exports \ diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 63db68dc7b2a..ff6db939553a 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -16,7 +16,7 @@ gb_BUILD_TOOLS_executables = \ climaker \ cpp \ cppumaker \ - $(if $(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),embindmaker wasmcallgen) \ + $(if $(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),embindmaker wasmbridgegen) \ gencoll_rule \ genconv_dict \ gendict \ diff --git a/static/Executable_wasmcallgen.mk b/static/Executable_wasmbridgegen.mk similarity index 59% rename from static/Executable_wasmcallgen.mk rename to static/Executable_wasmbridgegen.mk index 77f5d9daf782..1edbd3c724ca 100644 --- a/static/Executable_wasmcallgen.mk +++ b/static/Executable_wasmbridgegen.mk @@ -7,19 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Executable_Executable,wasmcallgen)) +$(eval $(call gb_Executable_Executable,wasmbridgegen)) -$(eval $(call gb_Executable_add_exception_objects,wasmcallgen, \ - static/source/wasmcallgen/wasmcallgen \ +$(eval $(call gb_Executable_add_exception_objects,wasmbridgegen, \ + static/source/wasmbridgegen/wasmbridgegen \ )) -$(eval $(call gb_Executable_use_libraries,wasmcallgen, \ +$(eval $(call gb_Executable_use_libraries,wasmbridgegen, \ sal \ salhelper \ unoidl \ )) -$(eval $(call gb_Executable_use_static_libraries,wasmcallgen, \ +$(eval $(call gb_Executable_use_static_libraries,wasmbridgegen, \ codemaker \ )) diff --git a/static/Module_static.mk b/static/Module_static.mk index 7403da211d27..337ca13945cb 100644 --- a/static/Module_static.mk +++ b/static/Module_static.mk @@ -34,7 +34,7 @@ endif ifneq ($(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),) $(eval $(call gb_Module_add_targets,static, \ Executable_embindmaker \ - Executable_wasmcallgen \ + Executable_wasmbridgegen \ )) endif diff --git a/static/source/wasmcallgen/wasmcallgen.cxx b/static/source/wasmbridgegen/wasmbridgegen.cxx similarity index 99% rename from static/source/wasmcallgen/wasmcallgen.cxx rename to static/source/wasmbridgegen/wasmbridgegen.cxx index 0c7b93c76f39..2fd3d5d29159 100644 --- a/static/source/wasmcallgen/wasmcallgen.cxx +++ b/static/source/wasmbridgegen/wasmbridgegen.cxx @@ -49,7 +49,7 @@ namespace { std::cerr << "Usage: " - " wasmcallgen <cpp-output> <asm-output> <exp-output> <registries> " + " wasmbridgegen <cpp-output> <asm-output> <exp-output> <registries> " "where each <registry> is '+' (primary) or ':' (secondary), followed by: either a " "new- or legacy-format .rdb file, a single .idl file, or a root directory of an " ".idl file tree. For all primary registries, Wasm UNO bridge code is written to "
