mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-13 05:44:11 +02:00
Improved project name override for macros
This commit is contained in:
parent
f9ea536d4a
commit
fa9b0d2297
1 changed files with 11 additions and 9 deletions
|
@ -9260,21 +9260,23 @@ namespace IDE
|
||||||
cmdErr = "Invalid number of arguments";
|
cmdErr = "Invalid number of arguments";
|
||||||
case "Var":
|
case "Var":
|
||||||
break ReplaceBlock;
|
break ReplaceBlock;
|
||||||
case "TargetDir",
|
case "Arguments",
|
||||||
"TargetPath",
|
|
||||||
"ProjectDir",
|
|
||||||
"BuildDir",
|
"BuildDir",
|
||||||
"LinkFlags":
|
"LinkFlags",
|
||||||
|
"ProjectDir",
|
||||||
|
"ProjectName",
|
||||||
|
"TargetDir",
|
||||||
|
"TargetPath",
|
||||||
|
"WorkingDir":
|
||||||
var selProject = mWorkspace.FindProject(args[0]);
|
var selProject = mWorkspace.FindProject(args[0]);
|
||||||
if (selProject != null)
|
if (selProject != null)
|
||||||
{
|
{
|
||||||
Workspace.Options selWorkspaceOptions = gApp.GetCurWorkspaceOptions();
|
Workspace.Options selWorkspaceOptions = gApp.GetCurWorkspaceOptions();
|
||||||
Project.Options selOptions = gApp.GetCurProjectOptions(selProject);
|
Project.Options selOptions = gApp.GetCurProjectOptions(selProject);
|
||||||
String selConfigString = scope String()..Append(configString);
|
String selConfigString = scope $"$({cmd})";
|
||||||
selConfigString.Remove(i - startIdx + 2 + cmd.Length, parenPos - i - 2 - cmd.Length);
|
replaceStr.Clear();
|
||||||
|
newString = scope:ReplaceBlock .();
|
||||||
result.RemoveToEnd(startIdx);
|
DoResolveConfigString(platformName, selWorkspaceOptions, selProject, selOptions, selConfigString, error, newString);
|
||||||
return DoResolveConfigString(platformName, selWorkspaceOptions, selProject, selOptions, selConfigString, error, result);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
cmdErr = "Unable to find project";
|
cmdErr = "Unable to find project";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue