reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-25 04:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

source_group: Fix TREE with root that is not current source dir

Browse Source 
Also raise an error if files are given that are not below the root.

Fixes: #16807
This commit is contained in:
Mateusz Janek 2017-04-20 21:45:28 +02:00 committed by Brad King
parent a6a0cfb24d
commit 1b4d2c741a
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Source/cmSourceGroupCommand.cxx
View File

@ -2,6 +2,9 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmSourceGroupCommand.h"
#include <algorithm>
#include <iterator>
#include <set>
#include <sstream>
#include "cmMakefile.h"
@ -34,21 +37,31 @@ std::string getFullFilePath(const std::string& currentPath,
}
std::set<std::string> getSourceGroupFilesPaths(
const std::string& currentPath, const std::string& root,
const std::vector<std::string>& files)
const std::string& root, const std::vector<std::string>& files)
{
std::set<std::string> ret;
const std::string::size_type rootLength = root.length();
for (size_t i = 0; i < files.size(); ++i) {
const std::string fullPath = getFullFilePath(currentPath, files[i]);
ret.insert(fullPath.substr(rootLength + 1)); // +1 to also omnit last '/'
ret.insert(files[i].substr(rootLength + 1)); // +1 to also omnit last '/'
}
return ret;
}
bool rootIsPrefix(const std::string& root,
const std::vector<std::string>& files, std::string& error)
{
for (size_t i = 0; i < files.size(); ++i) {
if (!cmSystemTools::StringStartsWith(files[i], root.c_str())) {
error = "ROOT: " + root + " is not a prefix of file: " + files[i];
return false;
}
}
return true;
}
cmSourceGroup* addSourceGroup(const std::vector<std::string>& tokenizedPath,
cmMakefile& makefile)
{
@ -66,7 +79,22 @@ cmSourceGroup* addSourceGroup(const std::vector<std::string>& tokenizedPath,
return sg;
}
bool addFilesToItsSourceGroups(const std::set<std::string>& sgFilesPaths,
std::string prepareFilePathForTree(const std::string& path)
{
return cmSystemTools::CollapseFullPath(path);
}
std::vector<std::string> prepareFilesPathsForTree(
std::vector<std::string>::const_iterator begin,
std::vector<std::string>::const_iterator end)
{
std::vector<std::string> prepared(std::distance(begin, end));
std::transform(begin, end, prepared.begin(), prepareFilePathForTree);
return prepared;
}
bool addFilesToItsSourceGroups(const std::string& root,
const std::set<std::string>& sgFilesPaths,
const std::string& prefix, cmMakefile& makefile,
std::string& errorMsg)
{
@ -91,8 +119,7 @@ bool addFilesToItsSourceGroups(const std::set<std::string>& sgFilesPaths,
errorMsg = "Could not create source group for file: " + *it;
return false;
}
const std::string fullPath =
getFullFilePath(makefile.GetCurrentSourceDirectory(), *it);
const std::string fullPath = getFullFilePath(root, *it);
sg->AddGroupFile(fullPath);
}
}
@ -231,17 +258,18 @@ bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
filesBegin = FilesWithPrefixKeywordIndex + 1;
}
const std::vector<std::string> filesVector(args.begin() + filesBegin,
args.end());
const std::vector<std::string> filesVector =
prepareFilesPathsForTree(args.begin() + filesBegin, args.end());
std::set<std::string> sourceGroupPaths = getSourceGroupFilesPaths(
this->Makefile->GetCurrentSourceDirectory(), root, filesVector);
if (!rootIsPrefix(root, filesVector, errorMsg)) {
return false;
}
addFilesToItsSourceGroups(sourceGroupPaths, prefix, *(this->Makefile),
errorMsg);
std::set<std::string> sourceGroupPaths =
getSourceGroupFilesPaths(root, filesVector);
if (!errorMsg.empty()) {
this->SetError(errorMsg);
if (!addFilesToItsSourceGroups(root, sourceGroupPaths, prefix,
*(this->Makefile), errorMsg)) {
return false;
}