strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnumake2: use gnu cp when available, fallback to posix tools outherwise

Browse source
This commit is contained in:
Bjoern Michaelsen 2010-12-01 22:24:21 +01:00
parent cdc0d6418e
commit 33aba82edf
5 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
solenv/gbuild/Deliver.mk
View file

@ -25,19 +25,13 @@
#
#*************************************************************************
# gb_Deliver_GNUCOPY is set by the platform
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
gb_Deliver_CLEARONDELIVER := $(true)
gb_Deliver__deliverprefix = mkdir -p $(dir $(1)) &&
ifeq ($(gb_Deliver_CLEARONDELIVER),$(true))
gb_Deliver__deliverprefix += rm -rf $(1) &&
endif
define gb_Deliver_init
gb_Deliver_DELIVERABLES :=
@ -49,9 +43,17 @@ gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODI
endef
ifeq($(strip $(gb_Deliver_GNUCOPY),)
define gb_Deliver_deliver
$(call gb_Deliver__deliverprefix,$(2)) $(gb_Deliver_GNUCOPY) -f $(1) $(2) && touch -r $(1) $(2)
mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(1) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
endef
else
define gb_Deliver_deliver
mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) -pf $(1) $(2)
endef
# We are currently only creating a deliver.log, if only one module gets build.
# As it is possible to add gbuild modules into other (which is done for example for

5
solenv/gbuild/platform/linux.mk
View file

@ -136,11 +136,6 @@ endif
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
# Deliver class
gb_Deliver_GNUCOPY := cp
# CObject class
define gb_CObject__command

1
solenv/gbuild/platform/macosx.mk
View file

@ -133,7 +133,6 @@ endif
# Helper class
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
gb_Deliver_GNUCOPY := cp
# CObject class

2
solenv/gbuild/platform/solaris.mk
View file

@ -116,8 +116,6 @@ endif
# Helper class
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
gb_Deliver_GNUCOPY := $(or $(GNUCOPY),gnucp)
# CObject class

1
solenv/gbuild/platform/windows.mk
View file

@ -181,7 +181,6 @@ endif
# Helper class
gb_Deliver_GNUCOPY := cp
gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR))
gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR))