Kaydet (Commit) 0723e6c5 authored tarafından Matúš Kukan's avatar Matúš Kukan

remove effectively unused gb_PARTIALBUILD

Change-Id: I5d00db54748de0e1ce3de3dd9c99a88a82e7917b
üst ff86a901
...@@ -79,7 +79,7 @@ define gbuild_module_rules ...@@ -79,7 +79,7 @@ define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
$(1): bootstrap fetch $(1): bootstrap fetch
cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
$(1).all: bootstrap fetch $(1).all: bootstrap fetch
$$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \ $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)), \
...@@ -91,10 +91,10 @@ $(1).all: bootstrap fetch ...@@ -91,10 +91,10 @@ $(1).all: bootstrap fetch
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
$(1).build $(1).check $(1).clean: $(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: $(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: $(1).deliver:
@true @true
...@@ -138,11 +138,11 @@ $(eval $(call dmake_modules_rules,$(dmake_modules))) ...@@ -138,11 +138,11 @@ $(eval $(call dmake_modules_rules,$(dmake_modules)))
# run a JunitTest - relies on naming convention (module prefix) # run a JunitTest - relies on naming convention (module prefix)
$(WORKDIR)/JunitTest/%/done : $(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) # run a CppunitTest - relies on naming convention (module prefix)
$(WORKDIR)/CppunitTest/%.test : $(WORKDIR)/CppunitTest/%.test :
cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@ gb_PARTIALBUILD=T cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
# #
# Help # Help
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
# #
#************************************************************************* #*************************************************************************
gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),) ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_build.mk include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_build.mk
endif endif
......
...@@ -1901,7 +1901,7 @@ sub run_job { ...@@ -1901,7 +1901,7 @@ sub run_job {
$gbuild_target = $ENV{gb_TAILBUILDTARGET}; $gbuild_target = $ENV{gb_TAILBUILDTARGET};
} }
$gbuild_flags .= ' ' . $ENV{GMAKE_OPTIONS}; $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; my $make_path = $path;
$make_path =~ s!/prj$!!; $make_path =~ s!/prj$!!;
chdir $make_path; chdir $make_path;
......
...@@ -92,50 +92,13 @@ $(call gb_Module_get_target,%) : ...@@ -92,50 +92,13 @@ $(call gb_Module_get_target,%) :
.PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations .PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations
.DEFAULT_GOAL := all .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 all : build unitcheck
$(info $(gb_Module_BUILDHINT))
build : build :
$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) $(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,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
$(call gb_Output_announce_title,build done.) $(call gb_Output_announce_title,build done.)
$(call gb_Output_announce_bell) $(call gb_Output_announce_bell)
$(info $(gb_Module_BUILDHINT))
unitcheck : unitcheck :
$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6) $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)
......
...@@ -34,14 +34,6 @@ gb_SpeedUpTargets_WRAPPEDBUILD:=T ...@@ -34,14 +34,6 @@ gb_SpeedUpTargets_WRAPPEDBUILD:=T
endif endif
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)),) ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
gb_Module_add_target= gb_Module_add_target=
gb_Module_add_check_target= gb_Module_add_check_target=
......
gb_PARTIALBUILD := T
ifeq ($(SOLARENV),) ifeq ($(SOLARENV),)
ifeq ($(gb_Side),) ifeq ($(gb_Side),)
gb_Side:=host gb_Side:=host
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
gb_PARTIALBUILD := T
ifeq ($(strip $(SOLARENV)),) ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../config_host.mk
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment