mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix --enable-wix switch - that didn't do anything

Browse Source 
it used the wrong variable name in AC_SUBST and also had no place where
it would be set for the rest of the build to use.
Also the script hardcodes the location of the WiX Toolkit, so check for
the same path in configure.
Also it was needlessly tied to LIBO_TEST_INSTALL - since it has its own
conditional, "double-guarding" it is not necessary.

Change-Id: I6dd4a41e63d2a43a3e2f1aac5b6799a6601eb656
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159510
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier
2023-11-16 14:28:55 +01:00
parent d343a2b639
commit e514f1a462
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -247,6 +247,7 @@ export ENABLE_WASM_STRIP_SPLASH=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_SWEXPORTS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_SWEXPORTS=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_SCEXPORTS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_SCEXPORTS=@ENABLE_WASM_STRIP@
export ENABLE_WERROR=@ENABLE_WERROR@ export ENABLE_WERROR=@ENABLE_WERROR@
ENABLE_WIX=@ENABLE_WIX@
export ENABLE_Z7_DEBUG=@ENABLE_Z7_DEBUG@ export ENABLE_Z7_DEBUG=@ENABLE_Z7_DEBUG@
export ENDIANNESS=@ENDIANNESS@ export ENDIANNESS=@ENDIANNESS@
export EPM=@EPM@ export EPM=@EPM@

8
configure.ac
View File

@@ -13680,12 +13680,14 @@ if test "$enable_wix" = "" -o "enable_wix" = "no"; then
ENABLE_WIX= ENABLE_WIX=
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
if ! which candle >/dev/null 2>&1; then # FIXME: this should do proper detection, but the path is currently
AC_MSG_ERROR([WiX requested but WiX toolset not found.]) # hardcoded in msicreator/createmsi.py
if ! test -x "/cygdrive/c/Program Files (x86)/WiX Toolset v3.11/bin/candle"; then
AC_MSG_ERROR([WiX requested but WiX toolset v3.11 not found at the expected location])
fi fi
ENABLE_WIX=TRUE ENABLE_WIX=TRUE
fi fi
AC_SUBST(ENABLE_SILENT_MSI) AC_SUBST(ENABLE_WIX)
AC_MSG_CHECKING([whether and how to use Xinerama]) AC_MSG_CHECKING([whether and how to use Xinerama])
if test "$USING_X11" = TRUE; then if test "$USING_X11" = TRUE; then

4
instsetoo_native/CustomTarget_install.mk
View File

@@ -59,7 +59,7 @@ endif
# delimiter is U+2027 Hyphenation point - files with colon in their name confuse the heck out of # delimiter is U+2027 Hyphenation point - files with colon in their name confuse the heck out of
# make and cannot be used as targets or prerequisites. For passing to call_installer.sh it is # make and cannot be used as targets or prerequisites. For passing to call_installer.sh it is
# substituted by the : so that cut doesn't stumble over the delimiter # substituted by the : so that cut doesn't stumble over the delimiter
ifeq (TRUE,$(LIBO_TEST_INSTALL)) ifeq (TRUE,$(filter TRUE,$(LIBO_TEST_INSTALL) $(ENABLE_WIX))
instsetoo_installer_targets = openoffice‧en-US‧‧‧archive‧nostrip instsetoo_installer_targets = openoffice‧en-US‧‧‧archive‧nostrip
ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
instsetoo_installer_targets += sdkoo‧en-US‧_SDK‧‧archive‧nostrip instsetoo_installer_targets += sdkoo‧en-US‧_SDK‧‧archive‧nostrip
@@ -129,8 +129,8 @@ $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(instsetoo_installer_targets) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(instsetoo_installer_targets)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(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)) $(if $(ENABLE_WIX),$(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 unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/ mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice* rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*

2
instsetoo_native/Module_instsetoo_native.mk
View File

@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,instsetoo_native)) $(eval $(call gb_Module_Module,instsetoo_native))
ifneq (,$(PKGFORMAT)$(filter TRUE,$(LIBO_TEST_INSTALL))) ifneq (,$(PKGFORMAT)$(filter TRUE,$(LIBO_TEST_INSTALL) $(ENABLE_WIX)))
$(eval $(call gb_Module_add_targets,instsetoo_native,\ $(eval $(call gb_Module_add_targets,instsetoo_native,\
CustomTarget_install \ CustomTarget_install \