strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solenv: remove gdb Package and CustomTarget

Browse source 
Since it's necessary to call install-gdb-printers anyway (which is what
the CustomTarget_gdb does), just do it first thing in "build" target
so that unit tests running during a from-scratch build get the pretty
printers too.

Change-Id: I357dfb828a2e0eed675aa552d3256f96a312a890
This commit is contained in:
Michael Stahl 2013-10-29 17:51:06 +01:00
parent 4b3dc6665d
commit 2cb380bad6
4 changed files with 3 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -233,11 +233,11 @@ bootstrap: compilerplugins
# Note: if invoked as "make check" this will also run subsequentcheck!
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c
endif
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)
ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
install-gdb-printers -a $(INSTDIR)
endif
ifeq ($(OS),IOS)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif

22
solenv/CustomTarget_gdb.mk
View file

@ -1,22 +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_CustomTarget_CustomTarget,solenv/gdb))
$(call gb_CustomTarget_get_target,solenv/gdb) : \
$(SRCDIR)/solenv/bin/install-gdb-printers \
$(SRCDIR)/solenv/gdb/autoload.template \
| $(call gb_CustomTarget_get_workdir,solenv/gdb)/.dir
$(call gb_CustomTarget_get_target,solenv/gdb) :
$(call gb_Output_announce,solenv/gdb,$(true),SH ,1)
install-gdb-printers -a $(call gb_CustomTarget_get_workdir,solenv/gdb) -f && \
touch $@
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

8
solenv/Module_solenv.mk
View file

@ -21,12 +21,4 @@ $(eval $(call gb_Module_add_targets,solenv,\
))
endif
ifneq ($(filter-out WNT IOS ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,solenv,\
CustomTarget_gdb \
Package_gdb \
))
endif
# vim: set shiftwidth=4 tabstop=4 noexpandtab:

38
solenv/Package_gdb.mk
View file

@ -1,38 +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,$(call gb_CustomTarget_get_workdir,solenv/gdb)))
$(eval $(call gb_Package_set_outdir,solenv_gdb,$(OUTDIR)))
# keep in sync with solenv/bin/install-gdb-printers
$(eval $(call gb_Package_add_files,solenv_gdb,lib,\
$(if $(MERGELIBS), \
$(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)-gdb.py \
$(call gb_Library_get_runtime_filename,sal)-gdb.py \
$(call gb_Library_get_runtime_filename,sw)-gdb.py \
) \
, \
$(call gb_Library_get_runtime_filename,basegfx)-gdb.py \
$(call gb_Library_get_runtime_filename,cppu)-gdb.py \
$(call gb_Library_get_runtime_filename,sal)-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 \
))
$(eval $(call gb_Package_use_custom_target,solenv_gdb,solenv/gdb))
# vim: set shiftwidth=4 tabstop=4 noexpandtab: