diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-18 17:16:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-18 17:16:02 (GMT) |
| commit | b2c4506dc8bd933b359d5ed2584cbcc7cd8a1258 (patch) | |
| tree | 50421d1a5a7ff36777de5d7c192f2da778cef716 | |
| parent | 5279cc9dc799b2279a2290813615836e8abeff6e (diff) | |
| parent | b9de3553ad6f26e96c5432df8b1b6be02fa5f9ca (diff) | |
| download | Qt-b2c4506dc8bd933b359d5ed2584cbcc7cd8a1258.zip Qt-b2c4506dc8bd933b359d5ed2584cbcc7cd8a1258.tar.gz Qt-b2c4506dc8bd933b359d5ed2584cbcc7cd8a1258.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qmake/symbian: Make sure the destination directory exists before copying
qmake/symbian: Don't give the -u flag to cp on Mac OS X, it isn't a standard flag
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake_abld.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index d8c38f4..decec14 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -104,7 +104,7 @@ contains(QMAKE_HOST.os,Windows) { QMAKE_COPY_DIR = cp -r QMAKE_MOVE = mv QMAKE_DEL_FILE = rm -f - QMAKE_MKDIR = mkdir + QMAKE_MKDIR = mkdir -p QMAKE_DEL_DIR = rmdir QMAKE_DEL_TREE = rm -rf QMAKE_CHK_DIR_EXISTS = test -d diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp index 127d5c0..f895109 100644 --- a/qmake/generators/symbian/symmake_abld.cpp +++ b/qmake/generators/symbian/symmake_abld.cpp @@ -205,8 +205,11 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool #ifdef Q_OS_WIN32 t << "XCOPY = xcopy /d /f /h /r /y /i" << endl; t << "ABLD = ABLD.BAT" << endl; +#elif defined(Q_OS_MAC) + t << "XCOPY = cp -R -v" << endl; + t << "ABLD = abld" << endl; #else - t << "XCOPY = cp -u -v" << endl; + t << "XCOPY = cp -R -u -v" << endl; t << "ABLD = abld" << endl; #endif t << "DEBUG_PLATFORMS = " << debugPlatforms.join(" ") << endl; @@ -447,6 +450,11 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t, bool i t << "\t-$(XCOPY) \"" << depList.at(i).from << "\" \"" << depList.at(i).to.left(depList.at(i).to.lastIndexOf("\\") + 1) << "\"" << endl; #else + QString dirExists = var("QMAKE_CHK_DIR_EXISTS"); + QString mkdir = var("QMAKE_MKDIR"); + QString dir = QFileInfo(depList.at(i).to).dir().path(); + t << "\t-@ " << dirExists << " \"" << dir << "\" || " + << mkdir << " \"" << dir << "\"" << endl; t << "\t-$(XCOPY) \"" << QDir::toNativeSeparators(depList.at(i).from) << "\" \"" << QDir::toNativeSeparators(depList.at(i).to) << "\"" << endl; #endif |