extras/CustomTarget_autocorr.mk | 4 ++--
extras/CustomTarget_autotextshare.mk | 5 +++--
extras/CustomTarget_autotextuser.mk | 7 ++++---
extras/CustomTarget_templates.mk | 14 ++++++++------
extras/CustomTarget_tplpresnt.mk | 7 ++++---
extras/CustomTarget_tplwizard.mk | 14 ++++++++------
solenv/gbuild/Extension.mk | 8 ++++----
solenv/gbuild/Zip.mk | 4 ++--
8 files changed, 35 insertions(+), 28 deletions(-)
New commits:
commit aa8ead8c584308a6ddcacad38cf60b1425450a6c
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Aug 2 17:03:01 2023 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:39:44 2024 +0200
run zip via wsl in wsl-as-helper case
Change-Id: I0c5b75c39c211aba08ae6d56f02bcc93ca11e2bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166337
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174240
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 3a8944374151..6fcbc2c66481 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -280,8 +280,8 @@
$(gb_CustomTarget_workdir)/extras/source/autocorr/acor_%.dat : \
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
$(autocorr_PYTHONCOMMAND) $(SRCDIR)/bin/check-autocorr.py
DocumentList.xml && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_AUTOCORR_XMLFILES_LANG,$(call extras_AUTOCORR_SHORTLANG,$*)) \
+ $(call gb_Helper_wsl_path,$(WSL) zip -q0X --filesync
--must-match $@ mimetype) && \
+ $(call gb_Helper_wsl_path,$(WSL) zip -qrX --must-match $@
$(call extras_AUTOCORR_XMLFILES_LANG,$(call extras_AUTOCORR_SHORTLANG,$*))) \
)
$(call gb_Trace_EndRange,autocorr/acor_$*.dat,ZIP)
diff --git a/extras/CustomTarget_autotextshare.mk
b/extras/CustomTarget_autotextshare.mk
index b6aeab448897..142ffafcbffe 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -3667,8 +3667,9 @@ $(gb_CustomTarget_workdir)/extras/source/autotext/%.bau :
\
$(call gb_Trace_StartRange,autotext/$*.bau,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_AUTOTEXTSHARE_XMLFILES_RELATIVE,$*) \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_AUTOTEXTSHARE_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,autotext/$*.bau,ZIP)
diff --git a/extras/CustomTarget_autotextuser.mk
b/extras/CustomTarget_autotextuser.mk
index 7b5ad91d1968..f81fb07250ad 100644
--- a/extras/CustomTarget_autotextuser.mk
+++ b/extras/CustomTarget_autotextuser.mk
@@ -40,9 +40,10 @@ $(gb_CustomTarget_workdir)/extras/source/autotext/user/%.bau
: \
$(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2)
$(call gb_Trace_StartRange,autotext/user/$*.bau,ZIP)
$(call gb_Helper_abbreviate_dirs,\
- cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_AUTOTEXTUSER_XMLFILES_RELATIVE,$*) \
+ cd $(dir $<) && \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_AUTOTEXTUSER_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,autotext/user/$*.bau,ZIP)
diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk
index 44425db1a164..b17ce37df9eb 100644
--- a/extras/CustomTarget_templates.mk
+++ b/extras/CustomTarget_templates.mk
@@ -78,9 +78,10 @@ $(gb_CustomTarget_workdir)/extras/source/templates/%.ott : \
$(call gb_Trace_StartRange,templates/$*.ott,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ styles.xml META-INF/manifest.xml
Thumbnails/thumbnail.png && \
- zip -qrX --must-match $@ $(call
extras_TEMPLATES_XMLFILES_RELATIVE,$*) \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_TEMPLATES_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,templates/$*.ott,ZIP)
@@ -100,9 +101,10 @@ $(gb_CustomTarget_workdir)/extras/source/templates/%.otg :
\
$(call gb_Trace_StartRange,templates/$*.otg,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ content.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
- zip -qrX --must-match $@ $(call
extras_TEMPLATES_XMLFILES_RELATIVE,$*) \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ content.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_TEMPLATES_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,templates/$*.otg,ZIP)
diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index b4f8ac61a110..73dcea7c604c 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -154,9 +154,10 @@
$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.otp : \
$(call gb_Trace_StartRange,templates/presnt/$*.otp,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ content.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
- zip -qrX --must-match $@ $(call
extras_PRESNT_XMLFILES_RELATIVE,$*) \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ content.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_PRESNT_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,templates/presnt/$*.otp,ZIP)
diff --git a/extras/CustomTarget_tplwizard.mk b/extras/CustomTarget_tplwizard.mk
index b22d6748047d..a4e273fa048e 100644
--- a/extras/CustomTarget_tplwizard.mk
+++ b/extras/CustomTarget_tplwizard.mk
@@ -210,9 +210,10 @@
$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ott : \
$(call gb_Trace_StartRange,templates/wizard/$*.ott,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ content.xml settings.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
- zip -qrX --must-match $@ $(call
extras_WIZARD_XMLFILES_RELATIVE,$*) \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ content.xml settings.xml
styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_WIZARD_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,templates/wizard/$*.ott,ZIP)
@@ -234,9 +235,10 @@
$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ots : \
$(call gb_Trace_StartRange,templates/wizard/$*.ots,ZIP)
$(call gb_Helper_abbreviate_dirs,\
cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ content.xml settings.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
- zip -qrX --must-match $@ $(call
extras_WIZARD_XMLFILES_RELATIVE,$*) \
+ $(call gb_Helper_wsl_path,\
+ $(WSL) zip -q0X --filesync --must-match $@ mimetype && \
+ $(WSL) zip -qrX --must-match $@ content.xml settings.xml
styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \
+ $(WSL) zip -qrX --must-match $@ $(call
extras_WIZARD_XMLFILES_RELATIVE,$*)) \
)
$(call gb_Trace_EndRange,templates/wizard/$*.ots,ZIP)
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 200e7d9e2a4f..42616e0b8655 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -111,8 +111,8 @@ $(call gb_Extension_get_target,%) : \
$(if $(LICENSE),cp -f $(LICENSE) $(call
gb_Extension_get_rootdir,$*)/registration &&) \
$(if $(and $(gb_Extension_TRANS_LANGS),$(DESCRIPTION)),cp
$(foreach lang,$(gb_Extension_TRANS_LANGS),$(call
gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call
gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
- cat $$RESPONSEFILE | $(gb_Extension_ZIPCOMMAND) -rX --filesync
--must-match \
- $(call gb_Extension_get_target,$*) --names-stdin) && rm
-f $$RESPONSEFILE
+ cat $$RESPONSEFILE | $(call gb_Helper_wsl_path,$(WSL)
$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
+ $(call gb_Extension_get_target,$*) --names-stdin)) &&
rm -f $$RESPONSEFILE
$(call gb_Trace_EndRange,$*,OXT)
# set file list and location of manifest and description files
@@ -466,8 +466,8 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
-idxcontent $(SRCDIR)/xmlhelp/util/idxcontent.xsl \
$$(HELPFILES) && \
(cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \
- $$(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \
- $$(HELPFILES)) && \
+ $$(call gb_Helper_wsl_path,$(WSL) $$(gb_Extension_ZIPCOMMAND) -r
$$(basename $$@)/help.jar \
+ $$(HELPFILES))) && \
$$(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \
-dir $$(basename $$@) && \
rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 07195358ea94..42a04783c054 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -50,8 +50,8 @@ $(call gb_Zip_get_target,%) :
$(FILES)) && \
cd $(LOCATION) && \
cat $${RESPONSEFILE} | tr "[:space:]" "
" | \
- $(gb_Zip_ZIPCOMMAND) -@rX --filesync
--must-match \
- $(call gb_Zip_get_target,$*) && \
+ $(call gb_Helper_wsl_path,$(WSL)
$(gb_Zip_ZIPCOMMAND) -@rX --filesync --must-match \
+ $(call gb_Zip_get_target,$*)) && \
rm -f $${RESPONSEFILE} && \
touch $@\
, cp $(SRCDIR)/solenv/gbuild/empty.zip $@)\
