[Libreoffice-commits] .: 3 commits - solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/Module.mk                         |    6 +++++-
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1f6be70688a74b9f2ff1f641ef45c6fc5d20cc38
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Nov 30 22:20:17 2011 +0100

    do not even read module dirs when shortcuting

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 2b86a7d..87209c2 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -45,6 +45,7 @@ $(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
+gb_Module_add_moduledir=
 gb_FULLDEPS=
 endif
 
commit f95bf9c68dde00624a9b4134993f9ddf14123d1a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Nov 30 22:16:11 2011 +0100

    debugrun does not need to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index e3b65b3..2b86a7d 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install smoketestoo_native instsetoo_native cross_toolset findunusedcode,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install smoketestoo_native instsetoo_native cross_toolset findunusedcode debugrun,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
commit 359dc427b4633b271078fbb80fdf674f54c89c0d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Nov 30 22:15:29 2011 +0100

    execute debugrun after building

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2efef85..c0f8ffd 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,7 +84,11 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
-debugrun :| build
+
+# execute debugrun at the end
+ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),)
+debugrun :| $(filter dev-install build all,$(MAKECMDGOALS))
+endif
 
 define gb_Module_BUILDHINT