diff options
| author | Rakielle <rakielledev@gmail.com> | 2023-02-12 21:42:00 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-04-22 04:52:55 +0200 |
| commit | 9aee0383c3ebc3f267c99e19764728ba09c12d3a (patch) | |
| tree | a36994ca5ceb49d48759a6356ec10da3fb982391 /instsetoo_native | |
| parent | 35787e07b7e83f7dcaa0c67830fcb4eded49c71f (diff) | |
Integrate msicreator into LO and generate installer
Co-authored-by: Ximena Alcaman <alcamanximena@gmail.com>
Change-Id: Iea2ea3b4bddc975a032592403727a4ff00db4a5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146843
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 3 | ||||
| -rw-r--r-- | instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp | bin | 0 -> 12681 bytes |
2 files changed, 3 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 29dcb4b0b1cd..e4c0f7fcb9e7 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -74,6 +74,8 @@ instsetoo_installer_targets := $(foreach pkgformat,$(PKGFORMAT),\ $(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),ooolangpack‧$(lang)‧‧-languagepack‧$(pkgformat)‧nostrip))) endif +LIBO_VERSION = $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) + instsetoo_wipe: $(call gb_Output_announce,wiping installation output dir,$(true),WPE,6) rm -rf $(instsetoo_OUT) @@ -113,6 +115,7 @@ $(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)/ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp Binary files differnew file mode 100644 index 000000000000..b3795cadea7d --- /dev/null +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp |
