feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Integrate target support

Browse Source 
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-02-08 15:50:06 +01:00
parent 8ee2521fe5
commit d1bdfcc363
102 changed files with 4893 additions and 1829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -28,9 +28,10 @@
**************************************************************************/
#include "genericproject.h"
#include "genericprojectconstants.h"
#include "genericmakestep.h"
#include "genericbuildconfiguration.h"
#include "genericprojectconstants.h"
#include "generictarget.h"
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -116,7 +117,7 @@ public:
GenericProject::GenericProject(Manager *manager, const QString &fileName)
: m_manager(manager),
m_fileName(fileName),
m_buildConfigurationFactory(new GenericBuildConfigurationFactory(this)),
m_targetFactory(new GenericTargetFactory(this)),
m_toolChain(0)
{
QFileInfo fileInfo(m_fileName);
@@ -141,9 +142,14 @@ GenericProject::~GenericProject()
delete m_toolChain;
}
IBuildConfigurationFactory *GenericProject::buildConfigurationFactory() const
GenericTargetFactory *GenericProject::targetFactory() const
{
return m_buildConfigurationFactory;
return m_targetFactory;
}
GenericTarget *GenericProject::activeTarget() const
{
return static_cast<GenericTarget *>(Project::activeTarget());
}
QString GenericProject::filesFileName() const
@@ -424,7 +430,7 @@ QStringList GenericProject::files(FilesMode fileMode) const
return m_files; // ### TODO: handle generated files here.
}
QStringList GenericProject::targets() const
QStringList GenericProject::buildTargets() const
{
QStringList targets;
targets.append(QLatin1String("all"));
@@ -445,21 +451,8 @@ bool GenericProject::fromMap(const QVariantMap &map)
return false;
// Add default BC:
if (buildConfigurations().isEmpty()) {
GenericBuildConfiguration *bc = new GenericBuildConfiguration(this);
bc->setDisplayName("all");
addBuildConfiguration(bc);
GenericMakeStep *makeStep = new GenericMakeStep(bc);
bc->insertBuildStep(0, makeStep);
makeStep->setBuildTarget("all", /* on = */ true);
const QFileInfo fileInfo(file()->fileName());
bc->setBuildDirectory(fileInfo.absolutePath());
setActiveBuildConfiguration(bc);
}
if (targets().isEmpty())
addTarget(targetFactory()->create(this, QLatin1String(GENERIC_DESKTOP_TARGET_ID)));
ToolChain::ToolChainType type =
static_cast<ProjectExplorer::ToolChain::ToolChainType>