summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-01-09 19:19:47 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2013-01-10 14:43:31 +0100
commit0723e6c57e26364821bd7edc6658000135faa723 (patch)
tree5f68038fab864ee66f671753bd94129f10630035
parentff86a901c4a0c20b8992176126e9274ed895a637 (diff)
remove effectively unused gb_PARTIALBUILD
Change-Id: I5d00db54748de0e1ce3de3dd9c99a88a82e7917b
-rw-r--r--Makefile.in10
-rw-r--r--cross_tail_build/Makefile1
-rwxr-xr-xsolenv/bin/build.pl2
-rw-r--r--solenv/gbuild/Module.mk37
-rw-r--r--solenv/gbuild/extensions/post_SpeedUpTargets.mk8
-rw-r--r--solenv/gbuild/partial_build.mk3
-rw-r--r--tail_build/Makefile1
7 files changed, 6 insertions, 56 deletions
diff --git a/Makefile.in b/Makefile.in
index 013548b8ee57..3ed0cdd7630a 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 5fe88caf29c1..89d362745b41 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 4f8199c532f2..a3ac71268085 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 27f0fde0ce10..0f985bbffa9c 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 a4cc23f4d62f..6175cbc04453 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 4a390fca9784..4583ef6de3ce 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 ac72f6a5916e..aca0e3293d59 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