AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed custom action exe path parsing

Browse Source 
Renamed custom action macros from '$' to '%' so that they match fossil's
Fixed Release build warnings

FossilOrigin-Name: b9521f3974653bd28a4f422c2f48755a949b9823
This commit is contained in:
Kostas
2015-08-21 09:42:44 +00:00
parent 9b26352141
commit 4ac8e89580
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MainWindow.cpp
View File

@@ -1742,6 +1742,7 @@ void MainWindow::loadFossilSettings()
Settings::Setting::SettingType type = it->Type;
Q_ASSERT(type == Settings::Setting::TYPE_FOSSIL_GLOBAL || type == Settings::Setting::TYPE_FOSSIL_LOCAL);
Q_UNUSED(type);
// Otherwise it must be a fossil setting
if(!kv.contains(name))

20
src/Utils.cpp
View File

@@ -535,10 +535,10 @@ void SplitCommandLine(const QString &commandLine, QString &command, QString &ext
}
int cmd_end = command.indexOf(cmd_char_end, start);
if(cmd_end != -1)
if(cmd_end > 0)
{
extraParams = command.mid(cmd_end+1);
command = command.left(cmd_end);
command = command.mid(start, cmd_end-1);
}
command = command.trimmed();
@@ -548,6 +548,10 @@ void SplitCommandLine(const QString &commandLine, QString &command, QString &ext
//------------------------------------------------------------------------------
bool SpawnExternalProcess(QObject *processParent, const QString& command, const QStringList& fileList, const stringset_t& pathSet, const QString &workspaceDir, UICallback &uiCallback)
{
static const char* MACRO_FILE = "%FILE";
static const char* MACRO_FOLDER = "%FOLDER";
static const char* MACRO_WORKSPACE = "%WORKSPACE";
QStringList params;
QString cmd, extra_params;
@@ -563,21 +567,21 @@ bool SpawnExternalProcess(QObject *processParent, const QString& command, const
foreach(const QString &p, extra_param_list)
{
if(p.indexOf("$FILE")!=-1)
if(p.indexOf(MACRO_FILE)!=-1)
{
macro_file = p;
continue;
}
else if(p.indexOf("$FOLDER")!=-1)
else if(p.indexOf(MACRO_FOLDER)!=-1)
{
macro_folder = p;
continue;
}
else if(p.indexOf("$WORKSPACE")!=-1)
else if(p.indexOf(MACRO_WORKSPACE)!=-1)
{
// Add in-place
QString n = p;
n.replace("$WORKSPACE", workspaceDir, Qt::CaseInsensitive);
n.replace(MACRO_WORKSPACE, workspaceDir, Qt::CaseInsensitive);
params.push_back(n);
continue;
}
@@ -595,7 +599,7 @@ bool SpawnExternalProcess(QObject *processParent, const QString& command, const
if(!macro_file.isEmpty())
{
QString macro = macro_file;
path = macro.replace("$FILE", path, Qt::CaseInsensitive);
path = macro.replace(MACRO_FILE, path, Qt::CaseInsensitive);
}
params.append(path);
@@ -611,7 +615,7 @@ bool SpawnExternalProcess(QObject *processParent, const QString& command, const
if(!macro_folder.isEmpty())
{
QString macro = macro_folder;
path = macro.replace("$FOLDER", path, Qt::CaseInsensitive);
path = macro.replace(MACRO_FOLDER, path, Qt::CaseInsensitive);
}
params.append(path);
}