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

vcxproj: fix custom build steps in different build variants

Browse Source 
There's a comment in VCXProjectWriter::outputFileConfigs that
states: "We need to check if the file has any custom build step.
If there is one then it has to be included with 'CustomBuild
Include'".
This patch adds the code to the comment...

Task-number: QTBUG-30373
Change-Id: Ibfef3c80630e08c743bfadce299a8b6a0c58411f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Joerg Bornemann 2014-09-23 18:44:12 +02:00
parent 55027c23df
commit 04d3a89e20
2 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
qmake/generators/win32/msbuild_objectmodel.cpp
View File

@ -1845,13 +1845,36 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
{ {
// We need to check if the file has any custom build step. // We need to check if the file has any custom build step.
// If there is one then it has to be included with "CustomBuild Include" // If there is one then it has to be included with "CustomBuild Include"
bool fileAdded = false; bool hasCustomBuildStep = false;
QVarLengthArray<OutputFilterData> data(project.SingleProjects.count());
for (int i = 0; i < project.SingleProjects.count(); ++i) {
data[i].filter = project.SingleProjects.at(i).filterByName(filtername);
if (!data[i].filter.Config) // only if the filter is not empty
continue;
VCFilter &filter = data[i].filter;
// Clearing each filter tool
filter.useCustomBuildTool = false;
filter.useCompilerTool = false;
filter.CustomBuildTool = VCCustomBuildTool();
filter.CustomBuildTool.config = filter.Config;
filter.CompilerTool = VCCLCompilerTool();
filter.CompilerTool.config = filter.Config;
VCFilterFile fileInFilter = filter.findFile(info.file, &data[i].inBuild);
data[i].inBuild &= !fileInFilter.excludeFromBuild;
if (data[i].inBuild && filter.addExtraCompiler(fileInFilter))
hasCustomBuildStep = true;
}
bool fileAdded = false;
for (int i = 0; i < project.SingleProjects.count(); ++i) { for (int i = 0; i < project.SingleProjects.count(); ++i) {
const VCFilter &filter = project.SingleProjects.at(i).filterByName(filtername); const VCFilter &filter = project.SingleProjects.at(i).filterByName(filtername);
if (filter.Config) // only if the filter is not empty if (!filter.Config) // only if the filter is not empty
if (outputFileConfig(filter, xml, xmlFilter, info.file, fileAdded)) // only add it once. continue;
fileAdded = true; if (outputFileConfig(&data[i], xml, xmlFilter, info.file, fileAdded,
hasCustomBuildStep))
fileAdded = true;
} }
if ( !fileAdded ) if ( !fileAdded )
@ -1861,36 +1884,25 @@ void VCXProjectWriter::outputFileConfigs(VCProject &project, XmlOutput &xml, Xml
xmlFilter << closetag(); xmlFilter << closetag();
} }
bool VCXProjectWriter::outputFileConfig(VCFilter filter, XmlOutput &xml, XmlOutput &xmlFilter, bool VCXProjectWriter::outputFileConfig(OutputFilterData *d, XmlOutput &xml, XmlOutput &xmlFilter,
const QString &filename, bool fileAdded) const QString &filename, bool fileAdded,
bool hasCustomBuildStep)
{ {
// Clearing each filter tool VCFilter &filter = d->filter;
filter.useCustomBuildTool = false; if (d->inBuild) {
filter.useCompilerTool = false;
filter.CustomBuildTool = VCCustomBuildTool();
filter.CustomBuildTool.config = filter.Config;
filter.CompilerTool = VCCLCompilerTool();
filter.CompilerTool.config = filter.Config;
bool inBuild;
VCFilterFile info = filter.findFile(filename, &inBuild);
inBuild &= !info.excludeFromBuild;
if (inBuild) {
filter.addExtraCompiler(info);
if (filter.Project->usePCH) if (filter.Project->usePCH)
filter.modifyPCHstage(info.file); filter.modifyPCHstage(filename);
} else { } else {
// Excluded files uses an empty compiler stage // Excluded files uses an empty compiler stage
if(info.excludeFromBuild) if (d->info.excludeFromBuild)
filter.useCompilerTool = true; filter.useCompilerTool = true;
} }
// Actual XML output ---------------------------------- // Actual XML output ----------------------------------
if (filter.useCustomBuildTool || filter.useCompilerTool if (hasCustomBuildStep || filter.useCompilerTool
|| !inBuild || filter.Name.startsWith("Deployment Files")) { || !d->inBuild || filter.Name.startsWith("Deployment Files")) {
if (filter.useCustomBuildTool) if (hasCustomBuildStep)
{ {
if (!fileAdded) { if (!fileAdded) {
fileAdded = true; fileAdded = true;
@ -1919,13 +1931,13 @@ bool VCXProjectWriter::outputFileConfig(VCFilter filter, XmlOutput &xml, XmlOutp
} }
const QString condition = generateCondition(*filter.Config); const QString condition = generateCondition(*filter.Config);
if(!inBuild) { if (!d->inBuild) {
xml << tag("ExcludedFromBuild") xml << tag("ExcludedFromBuild")
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag("true"); << valueTag("true");
} }
if (filter.Name.startsWith("Deployment Files") && inBuild) { if (filter.Name.startsWith("Deployment Files") && d->inBuild) {
xml << tag("DeploymentContent") xml << tag("DeploymentContent")
<< attrTag("Condition", condition) << attrTag("Condition", condition)
<< valueTag("true"); << valueTag("true");

9
qmake/generators/win32/msbuild_objectmodel.h
View File

@ -171,10 +171,17 @@ public:
void write(XmlOutput &, VCFilter &); void write(XmlOutput &, VCFilter &);
private: private:
struct OutputFilterData
{
VCFilter filter;
VCFilterFile info;
bool inBuild;
};
static void addFilters(VCProject &project, XmlOutput &xmlFilter, const QString &filterName); static void addFilters(VCProject &project, XmlOutput &xmlFilter, const QString &filterName);
static void outputFilter(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filtername); static void outputFilter(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filtername);
static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const VCFilterFile &info, const QString &filtername); static void outputFileConfigs(VCProject &project, XmlOutput &xml, XmlOutput &xmlFilter, const VCFilterFile &info, const QString &filtername);
static bool outputFileConfig(VCFilter filter, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded); static bool outputFileConfig(OutputFilterData *d, XmlOutput &xml, XmlOutput &xmlFilter, const QString &filename, bool fileAdded, bool hasCustomBuildStep);
static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName); static void outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QString &fileName, const QString &filterName);
static QString generateCondition(const VCConfiguration &config); static QString generateCondition(const VCConfiguration &config);