solenv/bin/build.pl | 1 - solenv/gbuild/Deliver.mk | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit 5127cb76e5905cd55a30a9dad36c10fcb25e9641 Author: Bjoern Michaelsen <[email protected]> Date: Wed May 23 11:37:12 2012 +0200 make gbuild deliver more robust in when using HARDLINK diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 79e4041..9be20ac 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -31,7 +31,12 @@ gb_Deliver_GNUCOPY := $(GNUCOPY) # if ($true) then old files will get removed from the target location before # they are copied there. In multi-user environments, this is needed you need to # be the owner of the target file to be able to modify timestamps +ifeq ($(strip gb_Deliver_HARDLINK),) gb_Deliver_CLEARONDELIVER := $(false) +else +gb_Deliver_CLEARONDELIVER := $(true) +endif + define gb_Deliver_init gb_Deliver_DELIVERABLES := @@ -54,15 +59,17 @@ endif endef -ifeq ($(strip $(gb_Deliver_GNUCOPY)),) define gb_Deliver__deliver $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2) endef -else + +ifneq ($(strip $(gb_Deliver_GNUCOPY)),) +ifeq ($(strip $(gb_Deliver_HARDLINK)),) define gb_Deliver__deliver -$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) $(if $(gb_Deliver_HARDLINK),--link) --no-dereference --force --preserve=timestamps $(1) $(2) +$(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --no-dereference --force --preserve=timestamps $(1) $(2) endef endif +endif define gb_Deliver_deliver $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\ commit 383d326685abaa4f722922305920c73e2eee6181 Author: Bjoern Michaelsen <[email protected]> Date: Thu May 3 15:36:17 2012 +0200 make foo.all should work again Change-Id: I49986d6feac5e46c7b2f3017cf97b07dce4db42f diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 221893a..fbdffcd 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1438,7 +1438,6 @@ sub get_module_and_buildlist_paths { my %active_modules_copy = %active_modules; foreach my $module ($source_config->get_all_modules()) { delete $active_modules_copy{$module} if defined($active_modules_copy{$module}); - next if ($module eq $initial_module); $module_paths{$module} = $source_config->get_module_path($module); $build_list_paths{$module} = $source_config->get_module_build_list($module); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
