[Libreoffice-commits] core.git: configure.ac Repository.mk RepositoryModule_build.mk solenv/gbuild svx/Executable_gengal.mk svx/Module_svx.mk
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Wed Dec 23 00:53:03 UTC 2020
Repository.mk | 2
RepositoryModule_build.mk | 62 ++++++++++++++---------------
configure.ac | 4 -
solenv/gbuild/extensions/pre_BuildTools.mk | 2
svx/Executable_gengal.mk | 4 +
svx/Module_svx.mk | 6 ++
6 files changed, 45 insertions(+), 35 deletions(-)
New commits:
commit 5de0f4e7b52e5d1c12ac658d4aedc91b9ac342cd
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Dec 21 16:28:29 2020 +0100
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Wed Dec 23 01:52:11 2020 +0100
Don't lock galleries build into DESKTOP
And add the missing dependency of Executable_gengal on
Package_svx_gengal, so the actual executable script is
created in instdir_for_build for the cross-toolset.
Change-Id: I98ea1d58273c871f0a3b804a93970eedfb7f8908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108108
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/Repository.mk b/Repository.mk
index 5311a5d1b84b..8407fcb7bf05 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -904,7 +904,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
sfx2_emojiconfig \
$(call gb_Helper_optional,DESKTOP,\
$(if $(filter-out WNT,$(OS)),$(if $(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \
- $(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX WNT,$(OS)),svx_gengal)) \
+ $(call gb_Helper_optional,DESKTOP,$(if $(filter-out EMSCRIPTEN MACOSX WNT,$(OS)),svx_gengal)) \
$(if $(USING_X11),vcl_fontunxppds) \
$(if $(filter $(OS),MACOSX),vcl_osxres) \
xmloff_dtd \
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 09bad286cffe..3ea89f432c41 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -56,38 +56,38 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
unotools \
ure \
xmlreader \
+ $(if $(WITH_GALLERY_BUILD), \
+ avmedia \
+ basic \
+ canvas \
+ configmgr \
+ connectivity \
+ cppcanvas \
+ drawinglayer \
+ editeng \
+ emfio \
+ filter \
+ framework \
+ linguistic \
+ officecfg \
+ package \
+ postprocess \
+ sfx2 \
+ shell \
+ sot \
+ svgio \
+ svl \
+ svtools \
+ svx \
+ toolkit \
+ ucb \
+ unoxml \
+ uui \
+ vcl \
+ xmloff \
+ xmlscript \
+ ) \
$(call gb_Helper_optional_for_host,DESKTOP, \
- $(if $(WITH_GALLERY_BUILD), \
- avmedia \
- basic \
- canvas \
- configmgr \
- connectivity \
- cppcanvas \
- drawinglayer \
- editeng \
- emfio \
- filter \
- framework \
- linguistic \
- officecfg \
- package \
- postprocess \
- sfx2 \
- shell \
- sot \
- svgio \
- svl \
- svtools \
- svx \
- toolkit \
- ucb \
- unoxml \
- uui \
- vcl \
- xmloff \
- xmlscript \
- ) \
helpcompiler \
xmlhelp \
) \
diff --git a/configure.ac b/configure.ac
index a256feeac194..bffdbd69cae6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2905,10 +2905,10 @@ AC_SUBST(SYSBASE)
dnl ===================================================================
dnl Sort out various gallery compilation options
dnl ===================================================================
+WITH_GALLERY_BUILD=TRUE
AC_MSG_CHECKING([how to build and package galleries])
if test -n "${with_galleries}"; then
if test "$with_galleries" = "build"; then
- WITH_GALLERY_BUILD=TRUE
AC_MSG_RESULT([build from source images internally])
elif test "$with_galleries" = "no"; then
WITH_GALLERY_BUILD=
@@ -2918,7 +2918,6 @@ if test -n "${with_galleries}"; then
fi
else
if test $_os != iOS -a $_os != Android; then
- WITH_GALLERY_BUILD=TRUE
AC_MSG_RESULT([internal src images for desktop])
else
WITH_GALLERY_BUILD=
@@ -5188,6 +5187,7 @@ if test "$cross_compiling" = "yes"; then
fi
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
+ test "$with_galleries" = "no" -o -z "$WITH_GALLERY_BUILD" && sub_conf_opts="$sub_conf_opts --with-galleries=no"
sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
# Don't bother having configure look for stuff not needed for the build platform anyway
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index c45be554a128..9327cbe41714 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -19,6 +19,7 @@ gb_BUILD_TOOLS = \
gencoll_rule \
genconv_dict \
gendict \
+ $(if $(WITH_GALLERY_BUILD),gengal) \
genindex_data \
helpex \
idxdict \
@@ -33,7 +34,6 @@ gb_BUILD_TOOLS = \
unoidl-write \
xrmex \
$(call gb_Helper_optional_for_host,DESKTOP, \
- gengal \
HelpIndexer \
HelpLinker \
lngconvex \
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index 9c82ac774ec5..1ec8841c1ab3 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Executable_use_external,gengal,boost_headers))
$(eval $(call gb_Executable_use_sdk_api,gengal))
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
+$(eval $(call gb_Executable_use_package,gengal,svx_gengal))
+endif
+
$(eval $(call gb_Executable_use_libraries,gengal,\
basegfx \
sal \
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 20339da7c58e..9a45df4943c1 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -51,7 +51,13 @@ $(eval $(call gb_Module_add_targets,svx,\
$(if $(filter-out MACOSX WNT,$(OS)), \
Package_gengal) \
))
+else # !DESKTOP
+ifeq ($(WITH_GALLERY_BUILD),TRUE)
+$(eval $(call gb_Module_add_targets_for_build,svx,\
+ Executable_gengal \
+))
endif
+endif # !DESKTOP
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
JunitTest_svx_unoapi \
More information about the Libreoffice-commits
mailing list