github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

let cpy-dir-rec.py take a param to suppress output. output stripped down versions of the directories being copied to the log.

This commit is contained in:
Kalamatee 2022-04-15 17:28:54 +01:00 committed by deadwood
parent 8527f5a7b7
commit a51b9e51bb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/make.tmpl
View File

@ -3303,7 +3303,8 @@ endif
#MM
%(mmake) :
$(Q)cd $(SRCDIR)/$(CURDIR) && $(CPYDIRREC) -s %(src) -d %(dst) -e %(excludefiles)
$(Q)$(ECHO) "Copying directory '$(if $(filter /%,%(src)),$(if $(filter $(SRCDIR)/%,$(abspath %(src))),$(patsubst $(SRCDIR)/%,%,$(abspath %(src))),$(patsubst $(TOP)/%,%,$(abspath %(src)))),$(patsubst $(SRCDIR)/%,%,$(abspath $(SRCDIR)/$(CURDIR)/%(src))))' to '$(if $(filter /%,%(dst)),$(if $(filter $(SRCDIR)/%,$(abspath %(dst))),$(patsubst $(SRCDIR)/%,%,$(abspath %(dst))),$(patsubst $(TOP)/%,%,$(abspath %(dst)))),$(patsubst $(SRCDIR)/%,%,$(abspath $(SRCDIR)/$(CURDIR)/%(dst))))'"
$(Q)cd $(SRCDIR)/$(CURDIR) && $(CPYDIRREC) -q -s %(src) -d %(dst) -e %(excludefiles)
%end
#------------------------------------------------------------------------------

10
scripts/cpy-dir-rec.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2013-2017, The AROS Development Team. All rights reserved.
# Copyright (C) 2013-2022, The AROS Development Team. All rights reserved.
# Copy directory 'src' recursively to 'dst' while ignoring
# all files given by 'ignore' parameter. Only files younger
@ -71,6 +71,7 @@ state = 0
sourcedir = "."
destdirs = []
ignore = []
quiet = 0
for arg in sys.argv:
if arg == "-s":
@ -79,8 +80,10 @@ for arg in sys.argv:
state = st_dest
elif arg == "-e":
state = st_exclude
elif arg == "-q":
quiet = 1
elif arg == "-h":
print("Usage: python cpy-dir-rec.py -s <souredir> -d <target directories> [-e <files to exclude>]")
print("Usage: python cpy-dir-rec.py -q -s <souredir> -d <target directories> [-e <files to exclude>]")
elif arg[0] == "-":
print("cpy-dir-rec: unknown argument %s" % arg)
sys.exit(1)
@ -93,5 +96,6 @@ for arg in sys.argv:
ignore.append(arg)
for destdir in destdirs:
print("Copying directory '%s' to '%s', ignore '%s'" % (sourcedir, destdir, ignore))
if quiet == 0:
print("Copying directory '%s' to '%s', ignore '%s'" % (sourcedir, destdir, ignore))
copy_tree(sourcedir, destdir, ignore)