[Libreoffice-commits] .: 4 commits - bridges/Module_bridges.mk cross_tail_build/Makefile Makefile.in solenv/bin solenv/gbuild tail_build/Makefile
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 10 05:45:21 PST 2013
Makefile.in | 11 ++--
bridges/Module_bridges.mk | 2
cross_tail_build/Makefile | 1
solenv/bin/build.pl | 2
solenv/gbuild/Module.mk | 61 +-----------------------
solenv/gbuild/extensions/post_SpeedUpTargets.mk | 38 +++++++-------
solenv/gbuild/gbuild.mk | 10 ---
solenv/gbuild/partial_build.mk | 3 -
tail_build/Makefile | 1
9 files changed, 30 insertions(+), 99 deletions(-)
New commits:
commit ca6aefe0839286515c6874b917e980eaa6d03282
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jan 10 14:42:07 2013 +0100
these are phony targets
Change-Id: I6de7842d5f03c6df5bffefdf77a90b5efee2fc78
diff --git a/Makefile.in b/Makefile.in
index 3ed0cdd..d114d81 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -422,6 +422,7 @@ check: dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
$(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRC_ROOT)/Makefile.post $@
+.PHONY : unitcheck slowcheck debugrun translations
unitcheck slowcheck debugrun translations:
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRC_ROOT)/Makefile.post $@
commit 26637fe8f241c6ae00f8fdcd5d2a647c7c3cb411
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Jan 9 21:37:10 2013 +0100
optimize for build targets in one place
Change-Id: Ib886a323c1ade6dcd455a44d3dfc6702086416e3
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 14a7255..c1dbcef 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -96,7 +96,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
) \
))
-ifeq ($(gb_FULL_BUILD),$(true))
+ifeq (,$(gb_STRIPPED_BUILD))
ifeq ($(strip $(bridges_SELECTED_BRIDGE)),)
$(call gb_Output_error,no bridge selected for build: bailing out)
endif
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 0f985bb..d20176a 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -89,7 +89,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations
+.PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations
.DEFAULT_GOAL := all
all : build unitcheck
@@ -130,6 +130,9 @@ check : unitcheck slowcheck
debugrun :
$(call gb_Module_DEBUGRUNCOMMAND)
+help :
+ @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
+
showmodules :
$(info $(strip $(gb_Module_ALLMODULES)))
@true
@@ -184,9 +187,6 @@ endif
endef
-gb_FULL_BUILD := $(if $(filter showmodules translations,$(MAKECMDGOALS)),$(false),$(true))
-
-ifeq ($(gb_FULL_BUILD),$(true))
define gb_Module_add_target
$(call gb_Module__read_targetfile,$(1),$(2),target)
@@ -220,7 +220,6 @@ $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef
-endif
define gb_Module_add_moduledir
include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 6175cbc..406a69e 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -25,23 +25,31 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-
-# speed up if no target need to parse all modules
-gb_SpeedUpTargets_WRAPPEDBUILD:=
ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/config_host.mk,$(MAKECMDGOALS)),)
-gb_SpeedUpTargets_WRAPPEDBUILD:=T
+# speed up depending on the target
+gb_SpeedUpTargets_LEVEL_3 := debugrun help translations
+gb_SpeedUpTargets_LEVEL_2 := showmodules $(gb_SpeedUpTargets_LEVEL_3)
+gb_SpeedUpTargets_LEVEL_1 := clean showdeliverables $(gb_SpeedUpTargets_LEVEL_2)
+
+ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T))
+gb_FULLDEPS :=
+
+ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_2),$(MAKECMDGOALS)),,T))
+gb_Module_add_target :=
+gb_Module_add_check_target :=
+gb_Module_add_slowcheck_target :=
+gb_Module_add_subsequentcheck_target :=
+
+# Turns of check in bridges/Module_bridges.mk:
+gb_STRIPPED_BUILD := $(true)
+
+ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_3),$(MAKECMDGOALS)),,T))
+gb_Module_add_moduledir :=
+
+endif
endif
endif
-ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
-gb_Module_add_target=
-gb_Module_add_check_target=
-gb_Module_add_slowcheck_target=
-gb_Module_add_subsequentcheck_target=
-gb_Module_add_moduledir=
-gb_FULLDEPS=
endif
# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
-
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index eebcfe9..1c092ed 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -154,13 +154,8 @@ endif
ifneq ($(nodep),)
gb_FULLDEPS := $(false)
else
-# for clean, setuplocal and removelocal goals we switch off dependencies
-ifneq ($(filter clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),)
-gb_FULLDEPS := $(false)
-else
gb_FULLDEPS := $(true)
endif
-endif
ifneq ($(strip $(patches)$(PATCHES)),)
gb_KEEP_PRISTINE := $(true)
@@ -355,9 +350,4 @@ endif
endef
-.PHONY: help
-help:
- @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
- @true
-
# vim: set noet sw=4:
commit 0723e6c57e26364821bd7edc6658000135faa723
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Jan 9 19:19:47 2013 +0100
remove effectively unused gb_PARTIALBUILD
Change-Id: I5d00db54748de0e1ce3de3dd9c99a88a82e7917b
diff --git a/Makefile.in b/Makefile.in
index 013548b..3ed0cdd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,7 @@ define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
$(1): bootstrap fetch
- cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
$(1).all: bootstrap fetch
$$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \
@@ -91,10 +91,10 @@ $(1).all: bootstrap fetch
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
$(1).build $(1).check $(1).clean:
- cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
$(1).subsequentcheck:
- cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck gb_PARTIALBUILD=T
+ cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
$(1).deliver:
@true
@@ -138,11 +138,11 @@ $(eval $(call dmake_modules_rules,$(dmake_modules)))
# run a JunitTest - relies on naming convention (module prefix)
$(WORKDIR)/JunitTest/%/done :
- cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@ gb_PARTIALBUILD=T
+ cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
# run a CppunitTest - relies on naming convention (module prefix)
$(WORKDIR)/CppunitTest/%.test :
- cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@ gb_PARTIALBUILD=T
+ cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
#
# Help
diff --git a/cross_tail_build/Makefile b/cross_tail_build/Makefile
index 5fe88ca..89d3627 100644
--- a/cross_tail_build/Makefile
+++ b/cross_tail_build/Makefile
@@ -26,7 +26,6 @@
#
#*************************************************************************
-gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_build.mk
endif
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 4f8199c..a3ac712 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1901,7 +1901,7 @@ sub run_job {
$gbuild_target = $ENV{gb_TAILBUILDTARGET};
}
$gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS};
- $job_to_do = "$ENV{GNUMAKE} -f Makefile $gbuild_flags $gbuild_target gb_PARTIALBUILD=T";
+ $job_to_do = "$ENV{GNUMAKE} -f Makefile $gbuild_flags $gbuild_target";
my $make_path = $path;
$make_path =~ s!/prj$!!;
chdir $make_path;
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 27f0fde..0f985bb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -92,50 +92,13 @@ $(call gb_Module_get_target,%) :
.PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations
.DEFAULT_GOAL := all
-ifeq ($(strip $(gb_PARTIALBUILD)),)
-check : subsequentcheck
-
-# execute debugrun at the end
-ifneq ($(filter build all,$(MAKECMDGOALS)),)
-debugrun :| $(filter build all,$(MAKECMDGOALS))
-endif
-
-ifneq ($(OS),WNT)
-define gb_Module_BUILDHINT
-
-LibreOffice build successfully finished.
-
-To install, issue: $(MAKE) install
-Developers might prefer this way: $(MAKE) dev-install -o build
-To run smoketest, issue: $(MAKE) check
-For crosscompiles, please consult README.cross how to install it.
-
-endef
-else
-define gb_Module_BUILDHINT
-
-LibreOffice build succesfully finished.
-
-Please consult instsetoo_native/README on installing it.
-
-endef
-endif
-
-else
-gb_Module_BUILDHINT=
-
-debugrun :| build
-endif
-
all : build unitcheck
- $(info $(gb_Module_BUILDHINT))
build :
$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6)
$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
$(call gb_Output_announce_title,build done.)
$(call gb_Output_announce_bell)
- $(info $(gb_Module_BUILDHINT))
unitcheck :
$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index a4cc23f..6175cbc 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -34,14 +34,6 @@ gb_SpeedUpTargets_WRAPPEDBUILD:=T
endif
endif
-ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out clean distclean id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/config_host.mk,$(MAKECMDGOALS)),)
-gb_SpeedUpTargets_WRAPPEDBUILD:=T
-endif
-endif
-endif
-
ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
gb_Module_add_target=
gb_Module_add_check_target=
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 4a390fc..4583ef6 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,6 +1,3 @@
-
-gb_PARTIALBUILD := T
-
ifeq ($(SOLARENV),)
ifeq ($(gb_Side),)
gb_Side:=host
diff --git a/tail_build/Makefile b/tail_build/Makefile
index ac72f6a..aca0e32 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk
endif
commit ff86a901c4a0c20b8992176126e9274ed895a637
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Jan 9 18:50:58 2013 +0100
dev-install target is used from toplevel Makefile
Change-Id: I5b53046e9389eac2126e910752d131e7b65bf53c
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2863be8..27f0fde 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -89,15 +89,15 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install showmodules translations
+.PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations
.DEFAULT_GOAL := all
ifeq ($(strip $(gb_PARTIALBUILD)),)
check : subsequentcheck
# execute debugrun at the end
-ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),)
-debugrun :| $(filter dev-install build all,$(MAKECMDGOALS))
+ifneq ($(filter build all,$(MAKECMDGOALS)),)
+debugrun :| $(filter build all,$(MAKECMDGOALS))
endif
ifneq ($(OS),WNT)
@@ -121,20 +121,8 @@ Please consult instsetoo_native/README on installing it.
endef
endif
-define gb_Module_DEVINSTALLHINT
-
-Developer installation finished, you can now execute:
-
-on Linux:
-make debugrun
-
-on Mac OS X:
-open install/LibreOffice.app
-
-endef
else
gb_Module_BUILDHINT=
-gb_Module_DEVINSTALLHINT=
debugrun :| build
endif
@@ -179,11 +167,6 @@ check : unitcheck slowcheck
debugrun :
$(call gb_Module_DEBUGRUNCOMMAND)
-dev-install :
- @rm -f $(SRCDIR)/install && \
- ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
- $(info $(gb_Module_DEVINSTALLHINT))
-
showmodules :
$(info $(strip $(gb_Module_ALLMODULES)))
@true
More information about the Libreoffice-commits
mailing list