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

Make qdbusxml2cpp output reproducible

Browse Source 
There doesn't seem to be a need for a timestamp in the include guard
anyway. The class name and similar stays the same, so it seems to just
add randomness to the build because it is possible.

Change-Id: I186d281d7ec4a3db08a128ca170e455132930cba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Sune Vuorela 2015-02-03 08:14:34 +01:00
parent 07cd153c7e
commit c030540f37
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
View File

@ -32,7 +32,6 @@
****************************************************************************/ ****************************************************************************/
#include <qbytearray.h> #include <qbytearray.h>
#include <qdatetime.h>
#include <qdebug.h> #include <qdebug.h>
#include <qfile.h> #include <qfile.h>
#include <qfileinfo.h> #include <qfileinfo.h>
@ -58,7 +57,6 @@ static QString parentClassName;
static QString proxyFile; static QString proxyFile;
static QString adaptorFile; static QString adaptorFile;
static QString inputFile; static QString inputFile;
static QDateTime classCreationTime;
static bool skipNamespaces; static bool skipNamespaces;
static bool verbose; static bool verbose;
static bool includeMocs; static bool includeMocs;
@ -212,10 +210,8 @@ static QDBusIntrospection::Interfaces readInput()
QFile input(inputFile); QFile input(inputFile);
if (inputFile.isEmpty() || inputFile == QLatin1String("-")) { if (inputFile.isEmpty() || inputFile == QLatin1String("-")) {
input.open(stdin, QIODevice::ReadOnly); input.open(stdin, QIODevice::ReadOnly);
classCreationTime = QDateTime::currentDateTime();
} else { } else {
input.open(QIODevice::ReadOnly); input.open(QIODevice::ReadOnly);
classCreationTime = QFileInfo(input).lastModified();
} }
QByteArray data = input.readAll(); QByteArray data = input.readAll();
@ -560,9 +556,8 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
} else { } else {
includeGuard = QLatin1String("QDBUSXML2CPP_PROXY"); includeGuard = QLatin1String("QDBUSXML2CPP_PROXY");
} }
includeGuard = QString(QLatin1String("%1_%2")) includeGuard = QString(QLatin1String("%1"))
.arg(includeGuard) .arg(includeGuard);
.arg(classCreationTime.toTime_t());
hs << "#ifndef " << includeGuard << endl hs << "#ifndef " << includeGuard << endl
<< "#define " << includeGuard << endl << "#define " << includeGuard << endl
<< endl; << endl;
@ -868,9 +863,8 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte
} else { } else {
includeGuard = QLatin1String("QDBUSXML2CPP_ADAPTOR"); includeGuard = QLatin1String("QDBUSXML2CPP_ADAPTOR");
} }
includeGuard = QString(QLatin1String("%1_%2")) includeGuard = QString(QLatin1String("%1"))
.arg(includeGuard) .arg(includeGuard);
.arg(QDateTime::currentDateTime().toTime_t());
hs << "#ifndef " << includeGuard << endl hs << "#ifndef " << includeGuard << endl
<< "#define " << includeGuard << endl << "#define " << includeGuard << endl
<< endl; << endl;