Makefile.top | 6 ++++++ solenv/gbuild/Module.mk | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 7374bd94885088fabd05c7b83c1f47d2c94836a3 Author: David Ostrovsky <[email protected]> Date: Sat Sep 29 22:09:39 2012 +0200 introduce some new top level targets Change-Id: I3ac81132e21710a2c1d974944a5bcd612d796ec6 diff --git a/Makefile.top b/Makefile.top index 2fb2a7c..8fd5620 100644 --- a/Makefile.top +++ b/Makefile.top @@ -421,6 +421,9 @@ ifeq ($(OS),ANDROID) cd android && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) endif +build-nocheck : export SKIP_TESTS := YES +build-nocheck : build + cross-toolset: bootstrap fetch cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) @@ -460,6 +463,9 @@ endif endif @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install +dev-install-nocheck : export SKIP_TESTS := YES +dev-install-nocheck : dev-install + install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index ae75d1d..17fc857 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -175,7 +175,7 @@ clean : check : unitcheck slowcheck $(call gb_Output_announce_title,all tests checked.) $(call gb_Output_announce_bell) - + debugrun : $(call gb_Module_DEBUGRUNCOMMAND) @@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -ifeq ($(strip $(NOCPPUNIT)),) +ifeq ($(strip $(SKIP_TESTS)),) define gb_Module_add_check_target $(call gb_Module__read_targetfile,$(1),$(2),check target) @@ -244,7 +244,6 @@ $(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -endif # NOCPPUNIT define gb_Module_add_slowcheck_target $(call gb_Module__read_targetfile,$(1),$(2),slowcheck target) @@ -253,6 +252,7 @@ $(call gb_Module_get_slowcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef +endif # SKIP_TESTS define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
