LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-07-29 21:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't install the uno script when uno is not build

Browse Source 
... move it into cpputools and rename ure/Package_install.mk to
ure/Package_ure_install.mk, to match the module name.

Follow up from commit 92a90cf5cc
("Don't build the static uno binary"). I missed that hunk in a
larger patch, because the script was in a different module, then
the binary.

Change-Id: If7f3152be9567cf84be176d3fedefbcd5ad8d387
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128138
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2022-01-08 13:29:00 +01:00
parent 326351e2b3
commit c906ac8e8a
6 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Repository.mk
View File

@ -849,6 +849,7 @@ $(eval $(call gb_Helper_register_packages_for_install,libreofficekit,\
$(eval $(call gb_Helper_register_packages_for_install,ure,\ $(eval $(call gb_Helper_register_packages_for_install,ure,\
instsetoo_native_setup_ure \ instsetoo_native_setup_ure \
$(call gb_CondExeUno,uno_sh) \
ure_install \ ure_install \
$(if $(ENABLE_JAVA),\ $(if $(ENABLE_JAVA),\
jvmfwk_jvmfwk3_ini \ jvmfwk_jvmfwk3_ini \

5
cpputools/Module_cpputools.mk
View File

@ -11,7 +11,10 @@ $(eval $(call gb_Module_Module,cpputools))
$(eval $(call gb_Module_add_targets,cpputools,\ $(eval $(call gb_Module_add_targets,cpputools,\
$(call gb_CondExeSp2bv,Executable_sp2bv) \ $(call gb_CondExeSp2bv,Executable_sp2bv) \
$(call gb_CondExeUno,Executable_uno) \ $(call gb_CondExeUno, \
Executable_uno \
Package_uno_sh \
) \
)) ))
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:

16
cpputools/Package_uno_sh.mk Normal file
View File

@ -0,0 +1,16 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Package_Package,uno_sh,$(SRCDIR)/cpputools/scripts))
ifneq (,$(filter-out MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,uno_sh,$(LIBO_URE_BIN_FOLDER)/uno,uno.sh))
endif
# vim:set noet sw=4 ts=4:

0
ure/source/uno → cpputools/scripts/uno.sh
View File

2
ure/Module_ure.mk
View File

@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,ure)) $(eval $(call gb_Module_Module,ure))
$(eval $(call gb_Module_add_targets,ure,\ $(eval $(call gb_Module_add_targets,ure,\
Package_install \ Package_ure_install \
Rdb_ure \ Rdb_ure \
)) ))

4
ure/Package_install.mk → ure/Package_ure_install.mk
View File

@ -9,10 +9,6 @@
$(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source)) $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
ifneq (,$(filter-out MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
endif
ifeq (MACOSX,$(OS)) ifeq (MACOSX,$(OS))
ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks)) $(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))