summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Behrens <thorsten.behrens@allotropia.de>2023-04-23 12:48:38 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2023-04-26 18:50:06 +0200
commit904dfc73d08ba51ed29f4009ba2290e6232c0489 (patch)
tree580d258b786cad9f546370dfca307ac652491b64
parentcid#1401342 Uncaught exception (diff)
downloadcore-904dfc73d08ba51ed29f4009ba2290e6232c0489.tar.gz
core-904dfc73d08ba51ed29f4009ba2290e6232c0489.zip
Disable WiX-based MSI generation for the moment
Right now, CI builders have no WiX toolset installed, breaking all daily builds (since commit 9aee0383c3ebc3f267c99e19764728ba09c12d3a) Change-Id: I92ba2590c5afa711d3079edc070fd904b01de6f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150823 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--instsetoo_native/CustomTarget_install.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index e4c0f7fcb9e7..ee69d07ebd8f 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -115,7 +115,6 @@ $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(instsetoo_installer_targets)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
- $(if $(LODE_HOME),$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) $(PRODUCTNAME_WITHOUT_SPACES))
ifeq (TRUE,$(LIBO_TEST_INSTALL))
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/