Hello Markus, all On 25 March 2012 16:37, Markus Mohrhard <markus.mohrh...@googlemail.com> wrote: > right now a top level make build is executing unit tests again. Is > this behavior really expected? It makes it quite hard to execute a > full rebuild while working on new tests.
Toplevel's make build is different from the modules' make build. _For me_ it's more like: do only build LibreOffice without installing. But of course it could also mean without running tests. For now, I created patch, which allows you to build what you want in module. (when the make is triggered by build.pl) Default is: make all slowcheck # all="build unitcheck" You need to set gb_MAKETARGET like this: make gb_MAKETARGET=build all make gb_MAKETARGET="unitcheck slowcheck" # prolly does not make sense make gb_MAKETARGET=build tools.all or whatever you want. Of course we can automatically set gb_MAKETARGET=build when running toplevel's make build if people don't use it like it was the same as 'make all' and was supposed to mean: build LibreOffice without dev-installing and running subsequent checks. If there is input from people to tell how we should set targets, .., I think we can do ~anything. Best, Matúš
From 71935f591dfed72ad190f4741fca752194aac1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.ku...@gmail.com> Date: Sun, 25 Mar 2012 18:09:37 +0200 Subject: [PATCH] The return of gb_MAKETARGET: allows us to set build targets --- Makefile | 7 +++++++ solenv/inc/gbuildbridge.mk | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4386267..9090c84 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,13 @@ ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all endif +# gb_MAKETARGET is used in gbuildbridge.mk, to set what we want to build. +# We communicate this way because the build is still controlled by build.pl. +# Default is to build everything and run slowchecks together with unitchecks. +ifeq ($(gb_MAKETARGET),) +export gb_MAKETARGET:=all slowcheck +endif + all: build SHELL=/usr/bin/env bash diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk index 529d6e2..b358bdc 100644 --- a/solenv/inc/gbuildbridge.mk +++ b/solenv/inc/gbuildbridge.mk @@ -34,8 +34,8 @@ TARGET=prj all: .ELIF "$(VERBOSE)"!="" all: - cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) all slowcheck + cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) .ELSE all: - @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) all slowcheck + @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) .END -- 1.7.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
