StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove destination before copying file"

Browse Source
This commit is contained in:
Dan Willemsen
2016-03-01 18:20:06 +00:00
committed by Gerrit Code Review
parent fc7c3d33b8 3545eeb6c1
commit 469665ded5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/definitions.mk
View File

@@ -2404,19 +2404,22 @@ endef
# Therefore copy-file-to-target is the same as copy-file-to-new-target. # Therefore copy-file-to-target is the same as copy-file-to-new-target.
define copy-file-to-target define copy-file-to-target
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(ACP) -fp $< $@ $(hide) rm -f $@
$(hide) $(ACP) -p $< $@
endef endef
# The same as copy-file-to-target, but use the local # The same as copy-file-to-target, but use the local
# cp command instead of acp. # cp command instead of acp.
define copy-file-to-target-with-cp define copy-file-to-target-with-cp
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) cp -fp $< $@ $(hide) rm -f $@
$(hide) cp -p $< $@
endef endef
# The same as copy-file-to-target, but use the zipalign tool to do so. # The same as copy-file-to-target, but use the zipalign tool to do so.
define copy-file-to-target-with-zipalign define copy-file-to-target-with-zipalign
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -f $@
$(hide) $(ZIPALIGN) -f 4 $< $@ $(hide) $(ZIPALIGN) -f 4 $< $@
endef endef
@@ -2424,6 +2427,7 @@ endef
# comments (for config files and such). # comments (for config files and such).
define copy-file-to-target-strip-comments define copy-file-to-target-strip-comments
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) rm -f $@
$(hide) sed -e 's/#.*$$//' -e 's/[ \t]*$$//' -e '/^$$/d' < $< > $@ $(hide) sed -e 's/#.*$$//' -e 's/[ \t]*$$//' -e '/^$$/d' < $< > $@
endef endef
@@ -2431,14 +2435,16 @@ endef
# the old modification time. # the old modification time.
define copy-file-to-new-target define copy-file-to-new-target
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(ACP) -fp $< $@ $(hide) rm -f $@
$(hide) $(ACP) -p $< $@
endef endef
# The same as copy-file-to-new-target, but use the local # The same as copy-file-to-new-target, but use the local
# cp command instead of acp. # cp command instead of acp.
define copy-file-to-new-target-with-cp define copy-file-to-new-target-with-cp
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) cp -f $< $@ $(hide) rm -f $@
$(hide) cp $< $@
endef endef
# Copy a prebuilt file to a target location. # Copy a prebuilt file to a target location.