e5a8134765
Commit 4f21eb03
broke the generation of non-flat vcxprojs.
XTreeNode passes filter names to outputFileConfigs that have
the source subdirectory suffixed (e.g. "Generated Files\subdir").
That's why the original code tested the filter names with
QString::startsWith.
I've changed the signature of outputFileConfigs to take a filterId
parameter which contains the unaltered filter name (e.g.
"Generated Files") that will determine the correct filter.
Task-number: QTBUG-41746
Change-Id: If33428526a098f433cd6ceb8ab6608bd9f94ef17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
198 lines
6.7 KiB
C++
198 lines
6.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of the qmake application of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL21$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef MSBUILD_OBJECTMODEL_H
|
|
#define MSBUILD_OBJECTMODEL_H
|
|
|
|
#include "project.h"
|
|
#include "xmloutput.h"
|
|
#include "msvc_objectmodel.h"
|
|
#include <qatomic.h>
|
|
#include <qlist.h>
|
|
#include <qstring.h>
|
|
#include <qstringlist.h>
|
|
#include <qmap.h>
|
|
#include <qdebug.h>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
// Tree & Flat view of files --------------------------------------------------
|
|
class XNode
|
|
{
|
|
public:
|
|
virtual ~XNode() { }
|
|
void addElement(const VCFilterFile &file) {
|
|
addElement(file.file, file);
|
|
}
|
|
virtual void addElement(const QString &filepath, const VCFilterFile &allInfo) = 0;
|
|
virtual void removeElements()= 0;
|
|
virtual void generateXML(XmlOutput &xml, XmlOutput &xmlFilter, const QString &tagName,
|
|
VCProject &tool, const QString &filter, const QString &filterId) = 0;
|
|
virtual bool hasElements() = 0;
|
|
};
|
|
|
|
class XTreeNode : public XNode
|
|
{
|
|
typedef QMap<QString, XTreeNode*> ChildrenMap;
|
|
VCFilterFile info;
|
|
ChildrenMap children;
|
|
|
|
public:
|
|
virtual ~XTreeNode() { removeElements(); }
|
|
|
|
int pathIndex(const QString &filepath) {
|
|
int Windex = filepath.indexOf("\\");
|
|
int Uindex = filepath.indexOf("/");
|
|
if (Windex != -1 && Uindex != -1)
|
|
return qMin(Windex, Uindex);
|
|
else if (Windex != -1)
|
|
return Windex;
|
|
return Uindex;
|
|
}
|
|
|
|
void addElement(const QString &filepath, const VCFilterFile &allInfo){
|
|
QString newNodeName(filepath);
|
|
|
|
int index = pathIndex(filepath);
|
|
if (index != -1)
|
|
newNodeName = filepath.left(index);
|
|
|
|
XTreeNode *n = children.value(newNodeName);
|
|
if (!n) {
|
|
n = new XTreeNode;
|
|
n->info = allInfo;
|
|
children.insert(newNodeName, n);
|
|
}
|
|
if (index != -1)
|
|
n->addElement(filepath.mid(index+1), allInfo);
|
|
}
|
|
|
|
void removeElements() {
|
|
ChildrenMap::ConstIterator it = children.constBegin();
|
|
ChildrenMap::ConstIterator end = children.constEnd();
|
|
for( ; it != end; it++) {
|
|
(*it)->removeElements();
|
|
delete it.value();
|
|
}
|
|
children.clear();
|
|
}
|
|
|
|
void generateXML(XmlOutput &xml, XmlOutput &xmlFilter, const QString &tagName, VCProject &tool,
|
|
const QString &filter, const QString &filterId);
|
|
bool hasElements() {
|
|
return children.size() != 0;
|
|
}
|
|
};
|
|
|
|
class XFlatNode : public XNode
|
|
{
|
|
typedef QMap<QString, VCFilterFile> ChildrenMapFlat;
|
|
ChildrenMapFlat children;
|
|
|
|
public:
|
|
virtual ~XFlatNode() { removeElements(); }
|
|
|
|
int pathIndex(const QString &filepath) {
|
|
int Windex = filepath.lastIndexOf("\\");
|
|
int Uindex = filepath.lastIndexOf("/");
|
|
if (Windex != -1 && Uindex != -1)
|
|
return qMax(Windex, Uindex);
|
|
else if (Windex != -1)
|
|
return Windex;
|
|
return Uindex;
|
|
}
|
|
|
|
void addElement(const QString &filepath, const VCFilterFile &allInfo){
|
|
QString newKey(filepath);
|
|
|
|
int index = pathIndex(filepath);
|
|
if (index != -1)
|
|
newKey = filepath.mid(index+1);
|
|
|
|
// Key designed to sort files with same
|
|
// name in different paths correctly
|
|
children.insert(newKey + "\0" + allInfo.file, allInfo);
|
|
}
|
|
|
|
void removeElements() {
|
|
children.clear();
|
|
}
|
|
|
|
void generateXML(XmlOutput &xml, XmlOutput &xmlFilter, const QString &tagName, VCProject &proj,
|
|
const QString &filter, const QString &filterId);
|
|
bool hasElements() {
|
|
return children.size() != 0;
|
|
}
|
|
};
|
|
|
|
class VCXProjectWriter : public VCProjectWriter
|
|
{
|
|
public:
|
|
void write(XmlOutput &, VCProjectSingleConfig &);
|
|
void write(XmlOutput &, VCProject &);
|
|
|
|
void write(XmlOutput &, const VCCLCompilerTool &);
|
|
void write(XmlOutput &, const VCLinkerTool &);
|
|
void write(XmlOutput &, const VCMIDLTool &);
|
|
void write(XmlOutput &, const VCCustomBuildTool &);
|
|
void write(XmlOutput &, const VCLibrarianTool &);
|
|
void write(XmlOutput &, const VCResourceCompilerTool &);
|
|
void write(XmlOutput &, const VCEventTool &);
|
|
void write(XmlOutput &, const VCDeploymentTool &);
|
|
void write(XmlOutput &, const VCWinDeployQtTool &);
|
|
void write(XmlOutput &, const VCConfiguration &);
|
|
void write(XmlOutput &, VCFilter &);
|
|
|
|
private:
|
|
struct OutputFilterData
|
|
{
|
|
VCFilter filter;
|
|
VCFilterFile info;
|
|
bool inBuild;
|
|
};
|
|
|
|
static void addFilters(VCProject &project, 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, const QString &filterId);
|
|
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 QString generateCondition(const VCConfiguration &config);
|
|
|
|
friend class XTreeNode;
|
|
friend class XFlatNode;
|
|
};
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // MSVC_OBJECTMODEL_H
|