strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename wasmcallgen -> wasmbridgegen

Browse source 
...to acknowledge the tools' more general role since
74829f2a64 "Fully implement the Wasm UNO bridge
cpp2uno direction"

Change-Id: Ie89255579774035f7b726d1d4b029dc536893ca0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170382
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann 2024-07-11 16:41:38 +02:00
parent b7a6d5752a
commit 69fc5c3960
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Repository.mk
View file

@ -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 \

5
bridges/CustomTarget_gcc3_wasm.mk
View file

@ -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 \

2
solenv/gbuild/extensions/pre_BuildTools.mk
View file

@ -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 \

10
static/Executable_wasmcallgen.mk → static/Executable_wasmbridgegen.mk
View file

@ -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 \
))

2
static/Module_static.mk
View file

@ -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

2
static/source/wasmcallgen/wasmcallgen.cxx → static/source/wasmbridgegen/wasmbridgegen.cxx
View file

@ -49,7 +49,7 @@ namespace
{
std::cerr
<< "Usage:\n\n"
" wasmcallgen <cpp-output> <asm-output> <exp-output> <registries>\n\n"
" wasmbridgegen <cpp-output> <asm-output> <exp-output> <registries>\n\n"
"where each <registry> is '+' (primary) or ':' (secondary), followed by: either a\n"
"new- or legacy-format .rdb file, a single .idl file, or a root directory of an\n"
".idl file tree. For all primary registries, Wasm UNO bridge code is written to\n"