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

fix invoke of target dir

Browse Source
This commit is contained in:
Andrei Yankovich 2019-12-12 22:50:04 +03:00
parent 063ad8ffd7
commit 3206347da0
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/deploy.cpp
View File

@ -58,7 +58,7 @@ bool Deploy::prepare() {
int Deploy::deploy() { int Deploy::deploy() {
_fileManager->loadDeployemendFiles(_paramsParser->config()->targetDir); _fileManager->loadDeployemendFiles(_paramsParser->config()->getTargetDir());
switch (DeployCore::getMode() ) { switch (DeployCore::getMode() ) {
case RunMode::Deploy: case RunMode::Deploy:
@ -70,7 +70,7 @@ int Deploy::deploy() {
default: default:
break; break;
} }
_fileManager->saveDeploymendFiles(_paramsParser->config()->targetDir); _fileManager->saveDeploymendFiles(_paramsParser->config()->getTargetDir());
return 0; return 0;
} }

2
Deploy/deployconfig.cpp
View File

@ -17,7 +17,7 @@ DeployConfig::getTargetsListByFilter(const QString &filter) {
return result; return result;
} }
QString DeployConfig::targetPath(const QString &target) { QString DeployConfig::getTargetDir(const QString &target) const {
if (targets.contains(target)) if (targets.contains(target))
return targetDir + targets.value(target).getSufix(); return targetDir + targets.value(target).getSufix();
return targetDir; return targetDir;

20
Deploy/deployconfig.h
View File

@ -28,12 +28,9 @@ struct DEPLOYSHARED_EXPORT Extra {
}; };
struct DEPLOYSHARED_EXPORT DeployConfig { class DEPLOYSHARED_EXPORT DeployConfig {
/**
* @brief targetDir - targe directory (this folder conteins all files of distrebution kit)
*/
QString targetDir = "";
public:
/** /**
* @brief depchLimit - recursive search limit * @brief depchLimit - recursive search limit
*/ */
@ -89,9 +86,18 @@ struct DEPLOYSHARED_EXPORT DeployConfig {
/** /**
* @brief targetPath * @brief targetPath
* @param target * @param target
* @return pathe to folder with target * @return path to deployement root dir of target.
* If target value well be empty then return main root of all targets.
*/ */
QString targetPath(const QString& target); QString getTargetDir(const QString& target = "") const;
private:
/**
* @brief targetDir - targe directory (this folder conteins all files of distrebution kit)
*/
QString targetDir = "";
}; };

2
Deploy/filemanager.cpp
View File

@ -208,7 +208,7 @@ bool FileManager::removeFile(const QString &file) {
bool FileManager::smartCopyFile(const QString &file, const QString &target, QStringList *mask) { bool FileManager::smartCopyFile(const QString &file, const QString &target, QStringList *mask) {
auto config = DeployCore::_config; auto config = DeployCore::_config;
if (file.contains(config->targetDir)) { if (file.contains(config->getTargetDir())) {
if (!moveFile(file, target, mask)) { if (!moveFile(file, target, mask)) {
QuasarAppUtils::Params::verboseLog(" file not moved! try copy"); QuasarAppUtils::Params::verboseLog(" file not moved! try copy");

6
Deploy/metafilemanager.cpp
View File

@ -37,7 +37,7 @@ bool MetaFileManager::createRunScriptWindows(const QString &target) {
content = content.arg(QFileInfo(target).fileName()).arg("%*"); content = content.arg(QFileInfo(target).fileName()).arg("%*");
content = QDir::toNativeSeparators(content); content = QDir::toNativeSeparators(content);
QString fname = DeployCore::_config->targetDir + QDir::separator() + QFileInfo(target).baseName()+ ".bat"; QString fname = DeployCore::_config->getTargetDir(target) + QDir::separator() + QFileInfo(target).baseName()+ ".bat";
QFile F(fname); QFile F(fname);
if (!F.open(QIODevice::WriteOnly)) { if (!F.open(QIODevice::WriteOnly)) {
@ -92,7 +92,7 @@ bool MetaFileManager::createRunScriptLinux(const QString &target) {
content = content.arg(""); content = content.arg("");
} }
QString fname = DeployCore::_config->targetDir + QDir::separator() + QFileInfo(target).baseName()+ ".sh"; QString fname = DeployCore::_config->getTargetDir(target) + QDir::separator() + QFileInfo(target).baseName()+ ".sh";
QFile F(fname); QFile F(fname);
if (!F.open(QIODevice::WriteOnly)) { if (!F.open(QIODevice::WriteOnly)) {
@ -156,7 +156,7 @@ bool MetaFileManager::createQConf(const QString &target) {
content.replace("//", "/"); content.replace("//", "/");
content = QDir::fromNativeSeparators(content); content = QDir::fromNativeSeparators(content);
QString fname = DeployCore::_config->targetDir + distro.getBinOutDir() + "qt.conf"; QString fname = DeployCore::_config->getTargetDir(target) + distro.getBinOutDir() + "qt.conf";
QFile F(fname); QFile F(fname);
if (!F.open(QIODevice::WriteOnly)) { if (!F.open(QIODevice::WriteOnly)) {