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

Don't lock galleries build into DESKTOP

Browse Source 
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@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2020-12-21 16:28:29 +01:00
parent 7206de4f3d
commit 5de0f4e7b5
6 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -904,7 +904,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
sfx2_emojiconfig \ sfx2_emojiconfig \
$(call gb_Helper_optional,DESKTOP,\ $(call gb_Helper_optional,DESKTOP,\
$(if $(filter-out WNT,$(OS)),$(if $(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \ $(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 $(USING_X11),vcl_fontunxppds) \
$(if $(filter $(OS),MACOSX),vcl_osxres) \ $(if $(filter $(OS),MACOSX),vcl_osxres) \
xmloff_dtd \ xmloff_dtd \

2
RepositoryModule_build.mk
View File

@@ -56,7 +56,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
unotools \ unotools \
ure \ ure \
xmlreader \ xmlreader \
$(call gb_Helper_optional_for_host,DESKTOP, \
$(if $(WITH_GALLERY_BUILD), \ $(if $(WITH_GALLERY_BUILD), \
avmedia \ avmedia \
basic \ basic \
@@ -88,6 +87,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
xmloff \ xmloff \
xmlscript \ xmlscript \
) \ ) \
$(call gb_Helper_optional_for_host,DESKTOP, \
helpcompiler \ helpcompiler \
xmlhelp \ xmlhelp \
) \ ) \

4
configure.ac
View File

@@ -2905,10 +2905,10 @@ AC_SUBST(SYSBASE)
dnl =================================================================== dnl ===================================================================
dnl Sort out various gallery compilation options dnl Sort out various gallery compilation options
dnl =================================================================== dnl ===================================================================
WITH_GALLERY_BUILD=TRUE
AC_MSG_CHECKING([how to build and package galleries]) AC_MSG_CHECKING([how to build and package galleries])
if test -n "${with_galleries}"; then if test -n "${with_galleries}"; then
if test "$with_galleries" = "build"; then if test "$with_galleries" = "build"; then
WITH_GALLERY_BUILD=TRUE
AC_MSG_RESULT([build from source images internally]) AC_MSG_RESULT([build from source images internally])
elif test "$with_galleries" = "no"; then elif test "$with_galleries" = "no"; then
WITH_GALLERY_BUILD= WITH_GALLERY_BUILD=
@@ -2918,7 +2918,6 @@ if test -n "${with_galleries}"; then
fi fi
else else
if test $_os != iOS -a $_os != Android; then if test $_os != iOS -a $_os != Android; then
WITH_GALLERY_BUILD=TRUE
AC_MSG_RESULT([internal src images for desktop]) AC_MSG_RESULT([internal src images for desktop])
else else
WITH_GALLERY_BUILD= WITH_GALLERY_BUILD=
@@ -5188,6 +5187,7 @@ if test "$cross_compiling" = "yes"; then
fi fi
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts --with-external-tar=$TARFILE_LOCATION" 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_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" 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 # Don't bother having configure look for stuff not needed for the build platform anyway

2
solenv/gbuild/extensions/pre_BuildTools.mk
View File

@@ -19,6 +19,7 @@ gb_BUILD_TOOLS = \
gencoll_rule \ gencoll_rule \
genconv_dict \ genconv_dict \
gendict \ gendict \
$(if $(WITH_GALLERY_BUILD),gengal) \
genindex_data \ genindex_data \
helpex \ helpex \
idxdict \ idxdict \
@@ -33,7 +34,6 @@ gb_BUILD_TOOLS = \
unoidl-write \ unoidl-write \
xrmex \ xrmex \
$(call gb_Helper_optional_for_host,DESKTOP, \ $(call gb_Helper_optional_for_host,DESKTOP, \
gengal \
HelpIndexer \ HelpIndexer \
HelpLinker \ HelpLinker \
lngconvex \ lngconvex \

4
svx/Executable_gengal.mk
View File

@@ -29,6 +29,10 @@ $(eval $(call gb_Executable_use_external,gengal,boost_headers))
$(eval $(call gb_Executable_use_sdk_api,gengal)) $(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,\ $(eval $(call gb_Executable_use_libraries,gengal,\
basegfx \ basegfx \
sal \ sal \

6
svx/Module_svx.mk
View File

@@ -51,7 +51,13 @@ $(eval $(call gb_Module_add_targets,svx,\
$(if $(filter-out MACOSX WNT,$(OS)), \ $(if $(filter-out MACOSX WNT,$(OS)), \
Package_gengal) \ Package_gengal) \
)) ))
else # !DESKTOP
ifeq ($(WITH_GALLERY_BUILD),TRUE)
$(eval $(call gb_Module_add_targets_for_build,svx,\
Executable_gengal \
))
endif endif
endif # !DESKTOP
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
JunitTest_svx_unoapi \ JunitTest_svx_unoapi \