odk/CustomTarget_doxygen.mk | 36 ++++++++++++++++----------------
solenv/gbuild/LinkTarget.mk | 7 ++----
solenv/gbuild/platform/com_MSC_class.mk | 3 --
3 files changed, 22 insertions(+), 24 deletions(-)
New commits:
commit d5897420b0df5222ef87dce60668df902a5e279a
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Aug 2 16:19:19 2023 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:02:11 2024 +0200
run bison, flex and nasm via wsl in wsl-as-helper case
Change-Id: Ic3e82b72605cd0b5458bd31ab5ff5285adb3db75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166340
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f4d15f411516..e054cffb4c85 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -499,9 +499,8 @@ endef
# gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target,
source-target)
define gb_LexTarget__command
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
- $(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) )
+ $(call gb_Helper_wsl_path,$(FLEX) $(T_LEXFLAGS) -o$(4) $(1)) && touch
$(3)
endef
@@ -647,8 +646,8 @@ $(call gb_GenNasmObject_get_target,%) :
$(call gb_Trace_StartRange,$*,ASM)
test -f $(call gb_GenNasmObject_get_source,$*) || (echo "Missing
generated source file $(call gb_GenNasmObject_get_source,$*)" && false)
mkdir -p $(dir $@) $(dir $(call gb_GenNasmObject_get_dep_target,$*)) &&
cd $(SRCDIR) && \
- $(NASM) $(T_NASMFLAGS) $(T_NASMFLAGS_APPEND) -I$(dir $(call
gb_GenNasmObject_get_source,$*)) \
- $(call gb_GenNasmObject_get_source,$*) -o $@ && \
+ $(call gb_Helper_wsl_path,$(NASM) $(T_NASMFLAGS)
$(T_NASMFLAGS_APPEND) -I$(dir $(call gb_GenNasmObject_get_source,$*)) \
+ $(call gb_GenNasmObject_get_source,$*) -o $@) && \
echo "$@ : $(call gb_GenNasmObject_get_source,$*)" > $(call
gb_GenNasmObject_get_dep_target,$*)
$(call gb_Trace_EndRange,$*,ASM)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 7e6b5e8d3b57..5424da11d75c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -26,9 +26,8 @@ endef
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
- $(BISON) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
+ $(call gb_Helper_wsl_path,$(WSL) $(BISON) $(T_YACCFLAGS) --defines=$(4)
-o $(5) $(1)) && touch $(3)
endef
commit f7fe6a0bed2c2aee19535a26181a2edfb103e587
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Jul 11 16:48:24 2023 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:02:00 2024 +0200
run doxygen via wsl in wsl-as-helper case
Change-Id: I534bcc8b07aea1637a3aea01cd1c5da998833a4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166339
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index a693adebde34..cc848699d73b 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -22,13 +22,13 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Type.h \
com/sun/star/uno/Type.hxx
-# Cygwin Doxygen needs unix paths
-odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1))
-odk_cpp_PREFIX := $(INSTDIR)/$(SDKDIRNAME)/include/
-odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \
+# Cygwin Doxygen needs unix paths, wsl-as-helper needs paths into windows-realm
+odk_cygwin_path = $(if $(MSYSTEM),$(call gb_Helper_wsl_path,$(1)),$(call
gb_Helper_cyg_path,$(1)))
+odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/)
+odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \
$(SRCDIR)/include/sal/log-areas.dox \
- $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST)
$(odk_cpp_INCFILELIST))
-odk_cpp_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref
+ $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST)
$(odk_cpp_INCFILELIST)))
+odk_cpp_DOXY_WORKDIR := $(call odk_cygwin_path,$(call
gb_CustomTarget_get_workdir,odk/docs/cpp)/ref)
$(eval $(call gb_CustomTarget_register_targets,odk/docs,\
cpp/Doxyfile \
@@ -40,12 +40,12 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile :
\
$(gb_Module_CURRENTMAKEFILE)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
- sed -e 's!^INPUT = %$$!INPUT = $(call
odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \
- -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call
odk_cygwin_path,$(odk_cpp_DOXY_WORKDIR))!' \
+ sed -e 's!^INPUT = %$$!INPUT = $(odk_cpp_DOXY_INPUT)!' \
+ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY =
$(odk_cpp_DOXY_WORKDIR)!' \
-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME)
$(PRODUCTVERSION) SDK C/C++ API Reference"!' \
-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-e 's!^QUIET = %$$!QUIET = $(if $(verbose),NO,YES)!' \
- -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call
odk_cygwin_path,$(odk_cpp_PREFIX))!' \
+ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH =
$(odk_cpp_PREFIX)!' \
$< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
@@ -57,7 +57,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log
: \
$(call gb_Package_get_target,odk_headers_generated)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
- rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
+ rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL)
$(DOXYGEN) $<) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN)
$(eval $(call gb_CustomTarget_register_targets,odk/docs,\
@@ -65,14 +65,14 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs,\
idl/doxygen.log \
))
-odk_idl_PREFIX := $(SRCDIR)/udkapi/ $(SRCDIR)/offapi/
+odk_idl_PREFIX := $(call odk_cygwin_path,$(SRCDIR)/udkapi/ $(SRCDIR)/offapi/)
# note: generated_idl_chapter_refs.idl must be the _last_ input file!
# otherwise spurious references to it will appear in the output
-odk_idl_DOXY_INPUT := $(SRCDIR)/odk/docs/idl/main.dox \
+odk_idl_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/idl/main.dox \
$(addsuffix com,$(odk_idl_PREFIX)) \
$(addsuffix org,$(odk_idl_PREFIX)) \
- $(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl
-odk_idl_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/idl)/ref
+ $(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl)
+odk_idl_DOXY_WORKDIR := $(call odk_cygwin_path,$(call
gb_CustomTarget_get_workdir,odk/docs/idl)/ref)
# don't depend on the IDL files directly but instead on the udkapi/offapi
# which will get rebuilt when any IDL file changes
@@ -83,12 +83,12 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile :
\
$(gb_Module_CURRENTMAKEFILE)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
- sed -e 's!^INPUT = %$$!INPUT = $(call
odk_cygwin_path,$(odk_idl_DOXY_INPUT))!' \
- -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call
odk_cygwin_path,$(odk_idl_DOXY_WORKDIR))!' \
+ sed -e 's!^INPUT = %$$!INPUT = $(odk_idl_DOXY_INPUT)!' \
+ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY =
$(odk_idl_DOXY_WORKDIR)!' \
-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME)
$(PRODUCTVERSION) SDK API Reference"!' \
-e 's!^PROJECT_NAME = %$$!PROJECT_NAME = $(PRODUCTNAME)!' \
-e 's!^QUIET = %$$!QUIET = $(if $(verbose),NO,YES)!' \
- -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call
odk_cygwin_path,$(odk_idl_PREFIX))!' \
+ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH =
$(odk_idl_PREFIX)!' \
-e 's!^SHORT_NAMES = %$$!SHORT_NAMES = $(if $(filter
WNT,$(OS)),YES,NO)!' \
$< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
@@ -98,7 +98,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log
: \
$(SRCDIR)/odk/docs/idl/main.dox
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
- rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
+ rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL)
$(DOXYGEN) $<) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN)
# vim: set noet sw=4 ts=4:
