Commit 119791ae authored by Sebastian Holtermann's avatar Sebastian Holtermann

Autogen: Generators: Introduce FileAbsentOrOlder function

parent 95e4cfc5
Pipeline #42449 passed with stage
......@@ -91,6 +91,19 @@ static std::string ReadAll(const std::string& filename)
return stream.str();
}
/**
* @brief Tests if buildFile doesn't exist or is older than sourceFile
* @return True if buildFile doesn't exist or is older than sourceFile
*/
static bool FileAbsentOrOlder(const std::string& buildFile,
const std::string& sourceFile)
{
int result = 0;
bool success =
cmsys::SystemTools::FileTimeCompare(buildFile, sourceFile, &result);
return (!success || (result <= 0));
}
static bool ListContains(const std::vector<std::string>& list,
const std::string& entry)
{
......@@ -1284,22 +1297,6 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
return false;
}
bool cmQtAutoGenerators::InputFilesNewerThanQrc(const std::string& qrcFile,
const std::string& rccOutput)
{
std::vector<std::string> const& files = this->RccInputs[qrcFile];
for (std::vector<std::string>::const_iterator it = files.begin();
it != files.end(); ++it) {
int inputNewerThanQrc = 0;
bool success =
cmsys::SystemTools::FileTimeCompare(*it, rccOutput, &inputNewerThanQrc);
if (!success || inputNewerThanQrc >= 0) {
return true;
}
}
return false;
}
bool cmQtAutoGenerators::GenerateQrcFiles()
{
// generate single map with input / output names
......@@ -1361,14 +1358,23 @@ bool cmQtAutoGenerators::GenerateQrc(const std::string& qrcInputFile,
const std::string qrcBuildFile = this->CurrentBinaryDir + qrcOutputFile;
int sourceNewerThanQrc = 0;
bool generateQrc = !cmsys::SystemTools::FileTimeCompare(
qrcInputFile, qrcBuildFile, &sourceNewerThanQrc);
generateQrc = generateQrc || (sourceNewerThanQrc >= 0);
generateQrc =
generateQrc || this->InputFilesNewerThanQrc(qrcInputFile, qrcBuildFile);
if (this->GenerateAll || generateQrc) {
bool generateQrc = this->GenerateAll;
// Test if the resources list file is newer than build file
if (!generateQrc) {
generateQrc = FileAbsentOrOlder(qrcBuildFile, qrcInputFile);
}
// Test if any resource file is newer than the build file
if (!generateQrc) {
const std::vector<std::string>& files = this->RccInputs[qrcInputFile];
for (std::vector<std::string>::const_iterator it = files.begin();
it != files.end(); ++it) {
if (FileAbsentOrOlder(qrcBuildFile, *it)) {
generateQrc = true;
break;
}
}
}
if (generateQrc) {
{
std::string msg = "Generating RCC source ";
msg += qrcOutputFile;
......
......@@ -86,8 +86,6 @@ private:
const std::string& uiOutputFile);
// - Qrc file generation
bool InputFilesNewerThanQrc(const std::string& qrcFile,
const std::string& rccOutput);
bool GenerateQrcFiles();
bool GenerateQrc(const std::string& qrcInputFile,
const std::string& qrcOutputFile, bool unique_n);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment