diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-09 19:19:47 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-10 14:43:31 +0100 |
| commit | 0723e6c57e26364821bd7edc6658000135faa723 (patch) | |
| tree | 5f68038fab864ee66f671753bd94129f10630035 /solenv | |
| parent | ff86a901c4a0c20b8992176126e9274ed895a637 (diff) | |
remove effectively unused gb_PARTIALBUILD
Change-Id: I5d00db54748de0e1ce3de3dd9c99a88a82e7917b
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/build.pl | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 37 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_SpeedUpTargets.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/partial_build.mk | 3 |
4 files changed, 1 insertions, 49 deletions
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 |