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

ProjectExplorer: Set unique build directory

Browse Source 
... after cloning a build configuration.
It's very unlikely that the user intends to re-use the same build
directory in the new build configuration.

Fixes: QTCREATORBUG-24831
Change-Id: I39b7839225e973fea4e16b9b686fbbf9207cb5ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-10 16:55:09 +01:00
parent 61622d305c
commit 48ebaecb52
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/stringutils.h
View File

@@ -90,18 +90,26 @@ QTCREATOR_UTILS_EXPORT QString expandMacros(const QString &str, AbstractMacroExp
QTCREATOR_UTILS_EXPORT int parseUsedPortFromNetstatOutput(const QByteArray &line); QTCREATOR_UTILS_EXPORT int parseUsedPortFromNetstatOutput(const QByteArray &line);
template<typename T, typename Container> template<typename T>
T makeUniquelyNumbered(const T &preferred, const Container &reserved) T makeUniquelyNumbered(const T &preferred, const std::function<bool(const T &)> &isOk)
{ {
if (!reserved.contains(preferred)) if (isOk(preferred))
return preferred; return preferred;
int i = 2; int i = 2;
T tryName = preferred + QString::number(i); T tryName = preferred + QString::number(i);
while (reserved.contains(tryName)) while (!isOk(tryName))
tryName = preferred + QString::number(++i); tryName = preferred + QString::number(++i);
return tryName; return tryName;
} }
template<typename T, typename Container>
T makeUniquelyNumbered(const T &preferred, const Container &reserved)
{
const std::function<bool(const T &)> isOk
= [&reserved](const T &v) { return !reserved.contains(v); };
return makeUniquelyNumbered(preferred, isOk);
}
QTCREATOR_UTILS_EXPORT QString formatElapsedTime(qint64 elapsed); QTCREATOR_UTILS_EXPORT QString formatElapsedTime(qint64 elapsed);
/* This function is only necessary if you need to match the wildcard expression against a /* This function is only necessary if you need to match the wildcard expression against a

15
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -31,7 +31,9 @@
#include "projectconfigurationmodel.h" #include "projectconfigurationmodel.h"
#include "session.h" #include "session.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
@@ -49,6 +51,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal; using namespace ProjectExplorer::Internal;
using namespace Utils;
/// ///
// BuildSettingsWidget // BuildSettingsWidget
@@ -251,7 +254,7 @@ QString BuildSettingsWidget::uniqueName(const QString & name)
continue; continue;
bcNames.append(bc->displayName()); bcNames.append(bc->displayName());
} }
result = Utils::makeUniquelyNumbered(result, bcNames); result = makeUniquelyNumbered(result, bcNames);
} }
return result; return result;
} }
@@ -297,6 +300,16 @@ void BuildSettingsWidget::cloneConfiguration()
return; return;
bc->setDisplayName(name); bc->setDisplayName(name);
const std::function<bool(const QString &)> isBuildDirOk = [this](const QString &candidate) {
const auto fp = FilePath::fromString(candidate);
if (fp.exists())
return false;
return !anyOf(m_target->buildConfigurations(), [&fp](const BuildConfiguration *bc) {
return bc->buildDirectory() == fp; });
};
bc->setBuildDirectory(FilePath::fromString(makeUniquelyNumbered(
bc->buildDirectory().toString(),
isBuildDirOk)));
m_target->addBuildConfiguration(bc); m_target->addBuildConfiguration(bc);
SessionManager::setActiveBuildConfiguration(m_target, bc, SetActive::Cascade); SessionManager::setActiveBuildConfiguration(m_target, bc, SetActive::Cascade);
} }