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

Add configure switch to enable building the installer with WiX.

Browse source 
Change-Id: I5b1cf7a4a90c65b27fd3a9e2f33c9ffe044704e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151738
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Jussi Pakkanen 2023-05-14 18:28:44 +03:00 committed by Christian Lohmaier
parent d2ab9d3ff3
commit 0f6bf89b1f
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configure.ac
View file

@ -1893,6 +1893,11 @@ AC_ARG_ENABLE(silent-msi,
[Enable MSI with LIMITUI=1 (silent install).]),
,)
AC_ARG_ENABLE(wix,
AS_HELP_STRING([--enable-wix],
[Build Windows installer using WiX.]),
,)
AC_ARG_ENABLE(macosx-code-signing,
AS_HELP_STRING([--enable-macosx-code-signing=<identity>],
[Sign executables, dylibs, frameworks and the app bundle. If you
@ -13427,6 +13432,21 @@ else
fi
AC_SUBST(ENABLE_SILENT_MSI)
dnl ===================================================================
dnl Check for WiX tools.
dnl ===================================================================
if test "$enable_wix" = "" -o "enable_wix" = "no"; then
AC_MSG_RESULT([no])
ENABLE_WIX=
else
AC_MSG_RESULT([yes])
if ! which candle >/dev/null 2>&1; then
AC_MSG_ERROR([WiX requested but WiX toolset not found.])
fi
ENABLE_WIX=TRUE
fi
AC_SUBST(ENABLE_SILENT_MSI)
AC_MSG_CHECKING([whether and how to use Xinerama])
if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
if test "$x_libraries" = "default_x_libraries"; then

1
instsetoo_native/CustomTarget_install.mk
View file

@ -116,6 +116,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(in
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(if $(ENABLE_WIX),$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) $(PRODUCTNAME_WITHOUT_SPACES))
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*