1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support directories in COPIES

Browse Source 
this makes it fully consistent with INSTALLS.

note that this also removes the file name from the target path when
copying files, also for consistency.

Change-Id: I69042c9aa1e2cc81f8ff982343ba25688a04abfd
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2016-04-29 11:36:15 +02:00
parent 49f92f9ab7
commit 8f0bf2d3d2
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mkspecs/features/file_copies.prf
View File

@ -18,10 +18,21 @@ defineReplace(qtStripProPwd) {
for (cp, COPIES) { for (cp, COPIES) {
isEmpty($${cp}.files): next() isEmpty($${cp}.files): next()
pfx = copy_$${cp} pfx = copy_$${cp}
for (f, $${cp}.files): \ notdir = false
$${pfx}.files += $$absolute_path($$f, $$_PRO_FILE_PWD_) dir = false
for (f, $${cp}.files) {
fil = $$absolute_path($$f, $$_PRO_FILE_PWD_)
tfiles = $$files($$fil/*)
isEmpty(tfiles): \
notdir = true
else: \
dir = true
$${pfx}.files += $$fil
}
$$dir:$$notdir: \
error("COPIES entry $$cp lists both files and directories.")
path = $$eval($${cp}.path) path = $$eval($${cp}.path)
isEmpty(path): error("COPY $cp defines no .path") isEmpty(path): error("COPIES entry $$cp defines no .path")
base = $$eval($${cp}.base) base = $$eval($${cp}.base)
isEmpty(base) { isEmpty(base) {
$${pfx}.output = $$path/${QMAKE_FILE_IN_NAME} $${pfx}.output = $$path/${QMAKE_FILE_IN_NAME}
@ -34,7 +45,12 @@ for (cp, COPIES) {
$${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripSrcDir_$$cp} $${pfx}.output = $$path/${QMAKE_FUNC_FILE_IN_qtStripSrcDir_$$cp}
} }
$${pfx}.input = $${pfx}.files $${pfx}.input = $${pfx}.files
$${pfx}.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} !$$dir: \
$${pfx}.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT_PATH}
else: !copy_dir_files: \
$${pfx}.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT_PATH}
else: \
$${pfx}.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
$${pfx}.name = COPY ${QMAKE_FILE_IN} $${pfx}.name = COPY ${QMAKE_FILE_IN}
$${pfx}.CONFIG = no_link no_clean target_predeps $${pfx}.CONFIG = no_link no_clean target_predeps
QMAKE_EXTRA_COMPILERS += $${pfx} QMAKE_EXTRA_COMPILERS += $${pfx}