diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-02 11:45:24 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-23 14:30:37 +0100 |
commit | a58e086ededb8442938e81f971dfae36ef7eb076 (patch) | |
tree | 86253cf4d614bb12d73604c3a3014a3acaa77686 /Makefile.in | |
parent | 339c9c2f66c04592f333601aa70c6da3f7cac20e (diff) |
rework the default make target
The current default target ('all') was a confusing mess, it did run
some tests, but it did run just some of them and it also depended
on some factors (toplevel 'make' vs module 'make'). And running
tests on plain 'make' also makes the developer cycle longer, which
is annoying, and now there's Jenkins which will do checks.
This commit makes the default make target to be 'build'. All
the other targets should work the same way, with the exception
of 'all', which I've removed (given that it was confusing, it's
probably better not to try to keep any kind of backwards compatibility
there). The 'build-nocheck' target is now equal to 'build' and thus
pointless, but I've kept it for backwards compatibility.
Change-Id: I874b7ae8d26e95efa86a00dd32cfa7fd19599b9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89820
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 7db07e62b7bc..50b781b2a06d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,13 +9,12 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot -.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) +.PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) -MAKECMDGOALS?=all -build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ - $(if $(filter build-nocheck slowcheck uicheck,$(MAKECMDGOALS)),build)\ - $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\ - $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS)) +MAKECMDGOALS?=build +build_goal:=$(if $(filter build build-nocheck slowcheck uicheck,$(MAKECMDGOALS)),build)\ + $(if $(filter check,$(MAKECMDGOALS)),unitcheck slowcheck subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\ + $(filter build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS)) SRCDIR := @SRC_ROOT@ BUILDDIR := @BUILDDIR@ @@ -57,7 +56,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \ else # MAKE_RESTARTS -all: build +.DEFAULT_GOAL := build check-if-root: @if test ! `uname` = 'Haiku' -a `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \ @@ -90,7 +89,7 @@ iwyudummy.generate: # Partial Build # define gb_Top_GbuildModuleRules -.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)) +.PHONY: $(1) $(1).build $(1).all $(1).check $(1).clean $(1).showdeliverables $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)) $(1): bootstrap fetch cd $(SRCDIR)/$(2) && $$(MAKE) $(IWYU_OPTION) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) @@ -274,7 +273,7 @@ bootstrap: check-if-root compilerplugins # Build # # Note: this will pipe through all gbuild targets to ... gbuild -# with some translations like "build"->"all" for historic reasons +# with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons # build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \ $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \ |