QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-04 21:49:35 +00:00
Code Issues Projects Releases Wiki Activity

temp commit

Browse Source
This commit is contained in:
Andrei Yankovich 2020-01-01 23:44:16 +03:00
parent 0429788ee0
commit 016f96d7f9
4 changed files with 17 additions and 9 deletions

19
Deploy/configparser.cpp

@ -375,9 +375,6 @@ bool ConfigParser::initPrefixes() {
return false;
}
_config.targets[pair.value(0, "")].setSufix(pair.value(1, ""));
}
}
@ -524,7 +521,7 @@ bool ConfigParser::setTargets(const QStringList &value) {
auto sufix = targetInfo.completeSuffix();
_config.targets.unite(prepareTarget(QDir::fromNativeSeparators(i)));
_config.targets.unite(createTarget(QDir::fromNativeSeparators(i)));
isfillList = true;
}
@ -590,7 +587,7 @@ bool ConfigParser::setBinDir(const QString &dir, bool recursive) {
result = true;
_config.targets.unite(prepareTarget(QDir::fromNativeSeparators(file.absoluteFilePath())));
_config.targets.unite(createTarget(QDir::fromNativeSeparators(file.absoluteFilePath())));
}
@ -599,7 +596,7 @@ bool ConfigParser::setBinDir(const QString &dir, bool recursive) {
return result;
}
QHash<QString, TargetInfo> ConfigParser::prepareTarget(const QString &target) {
QHash<QString, TargetInfo> ConfigParser::createTarget(const QString &target) {
TargetInfo libinfo;
auto key = target;
if (_scaner->fillLibInfo(libinfo, key)) {
@ -609,6 +606,14 @@ QHash<QString, TargetInfo> ConfigParser::prepareTarget(const QString &target) {
}
}
QHash<QString, TargetInfo>
ConfigParser::moveTarget(TargetInfo target, const QString& newLocation) {
target.setPath(QFileInfo(newLocation).absolutePath());
return {{newLocation, target}};
}
void ConfigParser::initIgnoreList()
{
if (QuasarAppUtils::Params::isEndable("ignore")) {
@ -1090,7 +1095,7 @@ bool ConfigParser::smartMoveTargets() {
}
auto newTargetKey = targetPath + "/" + target.fileName();
temp.unite(prepareTarget(newTargetKey));
temp.unite(moveTarget(i.value(), newTargetKey));
_config.prefixes[i.value().getSufix()].addTarget(newTargetKey);

4
Deploy/configparser.h

@ -78,7 +78,9 @@ private:
QString getRelativeLink(const QString& from, const QString& to);
void writeKey(const QString &key, QJsonObject &, const QString &confFileDir) const;
void readKey(const QString &key, const QJsonObject &obj, const QString &confFileDir) const;
QHash<QString, TargetInfo> prepareTarget(const QString &target);
QHash<QString, TargetInfo> createTarget(const QString &target);
QHash<QString, TargetInfo> moveTarget(TargetInfo target, const QString &newLocation);
QString readKeyArray(int separatorLvl, const QJsonArray &array, const QString &confFileDir) const;
QJsonValue writeKeyArray(int separatorLvl, const QString &parameter, const QString &confFileDir) const;

1
Deploy/distrostruct.h

@ -24,6 +24,7 @@ private:
QString trOutDir;
QString resOutDir;
QString pluginsOutDir;
QString 0refi
QString toFullPath(QString path) const;
QString stripPath(QString path) const;

2
UnitTests/tst_deploytest.cpp

@ -1191,7 +1191,7 @@ void deploytest::testPrefixes() {
"-targetPrefix", "/prefix/;Test"}, &comapareTree);
runTestParams({"-bin", bin, "force-clear",
"-targetPrefix", "/prefix/;" + target1}, &comapareTree);
"-targetPrefix", "/prefix/" + target1}, &comapareTree);
#ifdef Q_OS_UNIX
QString target2 = TestBinDir + "TestQMLWidgets";