summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-08-02 15:04:14 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-08-02 15:15:27 (GMT)
commitaff888a3e7f3d9ee2c5611c2dd5c0ff1693752c6 (patch)
treef6f0848b11488e3af3c6e74d3009bfca1b3e1b38
parent6876e18ddfcf3dd3e5fffaa02e23ad667287500e (diff)
downloadQt-aff888a3e7f3d9ee2c5611c2dd5c0ff1693752c6.zip
Qt-aff888a3e7f3d9ee2c5611c2dd5c0ff1693752c6.tar.gz
Qt-aff888a3e7f3d9ee2c5611c2dd5c0ff1693752c6.tar.bz2
configure: don't symlink the mkspecs/features directory
In shadow builds, the directory QT_BUILD_TREE/mkspecs/features isn't a mere symlink anymore. The directories below mkspecs/features are copied and every single file is symlinked. This makes it possible to place .prf files into a shadow build's mkspecs/features directory, like Qt Mobility does with its mobility.prf, without polluting the source directory. Task-number: QTBUG-12545 Reviewed-by: ossi
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index c61250b..52a4063 100755
--- a/configure
+++ b/configure
@@ -2397,6 +2397,14 @@ if [ "$OPT_SHADOW" = "yes" ]; then
ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
rm -f "$outpath/mkspecs/default"
+ # Special case for mkspecs/features directory.
+ # To be able to place .prf files into a shadow build directory,
+ # we're creating links for files only. The directory structure is reproduced.
+ # A simple "cp -rs" doesn't work on Mac. :(
+ rm -rf "$outpath/mkspecs/features"
+ find "$relpath/mkspecs/features" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
+ find "$relpath/mkspecs/features" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
+
# symlink the doc directory
rm -rf "$outpath/doc"
ln -s "$relpath/doc" "$outpath/doc"