summaryrefslogtreecommitdiffstats
path: root/src/linguist/shared/qmakebuiltins.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-02-24 16:22:53 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-09-14 13:49:26 +0000
commit902f30d4059e68fed4d73500de58ff0ebf8ad567 (patch)
treec185014f44f939ad5e862b96cbe819721f1fe4d0 /src/linguist/shared/qmakebuiltins.cpp
parentb72f5ecaab9327342e33b92c43312b8c5fc49ca9 (diff)
Preserve last modification timestamps of installed files
On non-windows platforms, we use the "-p" parameter of install(1) to preserve the last modification timestamps of files. On Windows the use of copy does not preserve them. As a cross-platform solution, this patch introduces a simple built-in install command in qmake to copy files. Task-number: QTBUG-59004 Change-Id: I3064d29a2b8c7b009a1efbf8f00b84c079ea5417 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> (cherry picked from qtbase/2ad7f6ddf5042d7442c97a89b083ca2853cf5721) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/linguist/shared/qmakebuiltins.cpp')
-rw-r--r--src/linguist/shared/qmakebuiltins.cpp60
1 files changed, 3 insertions, 57 deletions
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index 5b3400864..7fafdee86 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -57,9 +57,7 @@
#ifdef Q_OS_UNIX
#include <time.h>
-#include <utime.h>
#include <errno.h>
-#include <fcntl.h>
#include <unistd.h>
#include <signal.h>
#include <sys/wait.h>
@@ -260,23 +258,6 @@ QMakeEvaluator::getMemberArgs(const ProKey &func, int srclen, const ProStringLis
return true;
}
-#if defined(Q_OS_WIN) && defined(PROEVALUATOR_FULL)
-static QString windowsErrorCode()
-{
- wchar_t *string = 0;
- FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
- NULL,
- GetLastError(),
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPWSTR)&string,
- 0,
- NULL);
- QString ret = QString::fromWCharArray(string);
- LocalFree((HLOCAL)string);
- return ret.trimmed();
-}
-#endif
-
QString
QMakeEvaluator::quoteValue(const ProString &val)
{
@@ -1830,46 +1811,11 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
#ifdef PROEVALUATOR_FULL
const QString &tfn = resolvePath(args.at(0).toQString(m_tmp1));
const QString &rfn = resolvePath(args.at(1).toQString(m_tmp2));
-#ifdef Q_OS_UNIX
- struct stat st;
- if (stat(rfn.toLocal8Bit().constData(), &st)) {
- evalError(fL1S("Cannot stat() reference file %1: %2.").arg(rfn, fL1S(strerror(errno))));
+ QString error;
+ if (!IoUtils::touchFile(tfn, rfn, &error)) {
+ evalError(error);
return ReturnFalse;
}
-#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L
- const struct timespec times[2] = { { 0, UTIME_NOW }, st.st_mtim };
- const bool utimeError = utimensat(AT_FDCWD, tfn.toLocal8Bit().constData(), times, 0) < 0;
-#else
- struct utimbuf utb;
- utb.actime = time(0);
- utb.modtime = st.st_mtime;
- const bool utimeError = utime(tfn.toLocal8Bit().constData(), &utb) < 0;
-#endif
- if (utimeError) {
- evalError(fL1S("Cannot touch %1: %2.").arg(tfn, fL1S(strerror(errno))));
- return ReturnFalse;
- }
-#else
- HANDLE rHand = CreateFile((wchar_t*)rfn.utf16(),
- GENERIC_READ, FILE_SHARE_READ,
- NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- if (rHand == INVALID_HANDLE_VALUE) {
- evalError(fL1S("Cannot open reference file %1: %2").arg(rfn, windowsErrorCode()));
- return ReturnFalse;
- }
- FILETIME ft;
- GetFileTime(rHand, 0, 0, &ft);
- CloseHandle(rHand);
- HANDLE wHand = CreateFile((wchar_t*)tfn.utf16(),
- GENERIC_WRITE, FILE_SHARE_READ,
- NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- if (wHand == INVALID_HANDLE_VALUE) {
- evalError(fL1S("Cannot open %1: %2").arg(tfn, windowsErrorCode()));
- return ReturnFalse;
- }
- SetFileTime(wHand, 0, 0, &ft);
- CloseHandle(wHand);
-#endif
#endif
return ReturnTrue;
}