diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | solenv/Module_solenv.mk | 1 | ||||
| -rw-r--r-- | solenv/Package_gdb.mk | 22 | ||||
| -rw-r--r-- | solenv/Package_gdb_install.mk | 27 | ||||
| -rwxr-xr-x | solenv/bin/install-gdb-printers | 11 |
5 files changed, 21 insertions, 43 deletions
diff --git a/Makefile.in b/Makefile.in index f1d5b37e4468..5598af47963c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -230,6 +230,9 @@ bootstrap: compilerplugins # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild +ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) + install-gdb-printers -a $(INSTDIR) +endif ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index c3c1386282a8..4e78021c5b32 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -26,7 +26,6 @@ ifneq ($(filter-out WNT IOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_gdb \ Package_gdb \ - Package_gdb_install \ )) endif diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk index aced144be241..ab086f2e9e1e 100644 --- a/solenv/Package_gdb.mk +++ b/solenv/Package_gdb.mk @@ -9,21 +9,25 @@ $(eval $(call gb_Package_Package,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb))) +# keep in sync with solenv/bin/install-gdb-printers $(eval $(call gb_Package_add_files,solenv_gdb,lib,\ $(if $(MERGELIBS), \ - $(if $(filter ALL,$(MERGELIBS)), \ - $(call gb_Library_get_runtime_filename,urelibs)-gdb.py, \ + $(call gb_Library_get_runtime_filename,merged)-gdb.py \ + $(if $(filter ALL,$(MERGELIBS)), \ + $(call gb_Library_get_runtime_filename,urelibs)-gdb.py \ + , \ + $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ + $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ + $(call gb_Library_get_runtime_filename,sw)-gdb.py \ + ) \ + , \ + $(call gb_Library_get_runtime_filename,basegfx).3-gdb.py \ $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ + $(call gb_Library_get_runtime_filename,svl)-gdb.py \ $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,writerfilter)-gdb.py \ + $(call gb_Library_get_runtime_filename,tl)-gdb.py \ ) \ - $(call gb_Library_get_runtime_filename,merged)-gdb.py, \ - $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ - $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ - $(call gb_Library_get_runtime_filename,svl)-gdb.py \ - $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,tl)-gdb.py) \ $(call gb_Library_get_runtime_filename,writerfilter)-gdb.py \ )) diff --git a/solenv/Package_gdb_install.mk b/solenv/Package_gdb_install.mk deleted file mode 100644 index af67cb5c982d..000000000000 --- a/solenv/Package_gdb_install.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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,solenv_gdb_install,$(call gb_CustomTarget_get_workdir,solenv/gdb))) - -$(eval $(call gb_Package_set_outdir,solenv_gdb_install,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,solenv_gdb_install,$(gb_PROGRAMDIRNAME),\ - $(call gb_Library_get_runtime_filename,svl)-gdb.py \ - $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,tl)-gdb.py \ -)) - -$(eval $(call gb_Package_add_files,solenv_gdb_install,ure/lib,\ - $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ - $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ -)) - -$(eval $(call gb_Package_use_custom_target,solenv_gdb_install,solenv/gdb)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 4125fe5209c0..4c2aa393c78c 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -156,25 +156,24 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" fi +# keep in sync with solenv/Package_gdb.mk if [[ -n "${MERGELIBS}" ]]; then - make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx writerfilter `[[ ${MERGELIBS} == "ALL" ]] && echo sw` + make_autoload merged program libmergedlo."$DYLIB" merge svl tl basegfx `[[ ${MERGELIBS} == "ALL" ]] && echo sw` if [[ ${MERGELIBS} == "ALL" ]]; then make_autoload urelibs ure-link/lib liburelibs."$DYLIB" merge cppu sal else make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 make_autoload sw program libswlo."$DYLIB" - make_autoload basegfx program libbasegfxlo."$DYLIB" - make_autoload writerfilter program libwriterfilterlo."$DYLIB" fi else + make_autoload basegfx program libbasegfxlo."$DYLIB" make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 make_autoload svl program libsvllo."$DYLIB" - make_autoload tl program libtllo."$DYLIB" make_autoload sw program libswlo."$DYLIB" - make_autoload basegfx program libbasegfxlo."$DYLIB" - make_autoload writerfilter program libwriterfilterlo."$DYLIB" + make_autoload tl program libtllo."$DYLIB" fi +make_autoload writerfilter program libwriterfilterlo."$DYLIB" # vim:set shiftwidth=4 softtabstop=4 expandtab: |