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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/Module.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.help.txt | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index d419ecbc069c..761dd539caa5 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -37,7 +37,6 @@ # subsequentcheck (global) run system tests top-level Module/subsequentcheck # perfcheck (global) run performance unit tests top-level Module/perfcheck # uicheck (global) run the uitests run all uitests -# all (global) default goal build unitcheck # Module class @@ -149,10 +148,8 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) && \ touch $@) -.PHONY : all build build-l10n-only build-non-l10n-only unitcheck slowcheck screenshot subsequentcheck stagingcheck perfcheck uicheck clean check debugrun help showmodules translations -.DEFAULT_GOAL := all - -all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)) +.PHONY : build build-l10n-only build-non-l10n-only unitcheck slowcheck screenshot subsequentcheck stagingcheck perfcheck uicheck clean check debugrun help showmodules translations +.DEFAULT_GOAL := build ifeq ($(gb_Side),build) build-tools : $(gb_BUILD_TOOLS) @@ -199,7 +196,7 @@ screenshot : $(call gb_Output_announce_bell) # removing the dependency on build for now until we can make a full build with gbuild -#subsequentcheck : all +#subsequentcheck : build subsequentcheck : $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)) $(call gb_Output_announce_title,all subsequent tests checked.) diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 3b0e00474961..65cc4ce6d689 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -27,7 +27,7 @@ IMPORTANT OPTIONS (descriptions from GNU make man page) AVAILABLE TARGETS - all build product and run unit tests (default goal) + build build product (default goal) clean remove all generated files debugrun starts the INSTDIR instance and allows tests to be run against it. You can provide additional @@ -51,8 +51,8 @@ AVAILABLE TARGETS NOTE: needs graphviz to work showmodules shows all registered modules - <module> build the named module - <module>.build build the named module without running unittests + <module> build the named module (without running unittests) + <module>.build an alias for the above <module>.check run unittests of the named module <module>.clean clean the named module <module>.all build the named module and the pre-requisite modules for it |