odk/CustomTarget_doxygen.mk | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit e648996cc9c007a2b374946cd4555c0430052a7c
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Jul 11 16:48:24 2023 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:40:51 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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174242
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index cc7c6db7e674..0e375081dadb 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 := $(gb_CustomTarget_workdir)/odk/docs/cpp/ref
+odk_cpp_DOXY_WORKDIR := $(call
odk_cygwin_path,$(gb_CustomTarget_workdir)/odk/docs/cpp/ref)
$(eval $(call gb_CustomTarget_register_targets,odk/docs,\
cpp/Doxyfile \
@@ -40,12 +40,12 @@ $(gb_CustomTarget_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 @@ $(gb_CustomTarget_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 := $(gb_CustomTarget_workdir)/odk/docs/idl/ref
+odk_idl_DOXY_WORKDIR := $(call
odk_cygwin_path,$(gb_CustomTarget_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 @@ $(gb_CustomTarget_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 @@ $(gb_CustomTarget_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:
