Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-12 21:34:11 +02:00
Code Activity

Added project context directly to the script commands

Browse source
This commit is contained in:
Brian Fiete 2020-05-30 06:03:13 -07:00
parent 0503eedfe6
commit 31a23bff3a
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
IDE/src/BuildContext.bf
View file

@ -154,14 +154,13 @@ namespace IDE
if (mScriptManager == null) if (mScriptManager == null)
{ {
mScriptManager = new .(mScriptContext); mScriptManager = new .(mScriptContext);
mScriptManager.mProjectName = new String(project.mProjectName);
mScriptManager.mIsBuildScript = true; mScriptManager.mIsBuildScript = true;
mScriptManager.mSoftFail = true; mScriptManager.mSoftFail = true;
mScriptManager.mVerbosity = gApp.mVerbosity; mScriptManager.mVerbosity = gApp.mVerbosity;
didCommands = true; didCommands = true;
} }
mScriptManager.QueueCommands(customCmd, project.mProjectName, .NoLines); mScriptManager.QueueCommands(customCmd, scope String()..AppendF("project {}", project.mProjectName), .NoLines);
continue; continue;
} }

22
IDE/src/ScriptManager.bf
View file

@ -81,7 +81,6 @@ namespace IDE
public bool mIsBuildScript; public bool mIsBuildScript;
public bool mSoftFail; public bool mSoftFail;
public Verbosity mVerbosity = .Quiet; public Verbosity mVerbosity = .Quiet;
public String mProjectName ~ delete _;
public bool Failed public bool Failed
{ {
@ -429,9 +428,10 @@ namespace IDE
if (workspaceOptions == null) if (workspaceOptions == null)
{ {
workspaceOptions = gApp.GetCurWorkspaceOptions(); workspaceOptions = gApp.GetCurWorkspaceOptions();
if (mProjectName != null) if (mCurCmd.mSrcFile?.StartsWith("project ") == true)
{ {
project = gApp.mWorkspace.FindProject(mProjectName); String projectName = scope String()..Append(mCurCmd.mSrcFile, "Project ".Length);
project = gApp.mWorkspace.FindProject(projectName);
if (project != null) if (project != null)
projectOptions = gApp.GetCurProjectOptions(project); projectOptions = gApp.GetCurProjectOptions(project);
} }
@ -1133,11 +1133,11 @@ namespace IDE
} }
} }
/*[IDECommand] [IDECommand]
public void Copy(String srcPath, String destPath) public void Echo(String str)
{ {
gApp.OutputLine(str);
}*/ }
[IDECommand] [IDECommand]
public void CopyFilesIfNewer(String srcPath, String destPath) public void CopyFilesIfNewer(String srcPath, String destPath)
@ -1234,16 +1234,16 @@ namespace IDE
public Project GetProject() public Project GetProject()
{ {
if (mScriptManager.mProjectName == null) if (!mScriptManager.mCurCmd.mSrcFile.StartsWith("project "))
{ {
mScriptManager.Fail("Only usable in the context of a project"); mScriptManager.Fail("Only usable in the context of a project");
return null; return null;
} }
let projectName = scope String()..Append(mScriptManager.mCurCmd.mSrcFile, "Project ".Length);
let project = gApp.mWorkspace.FindProject(mScriptManager.mProjectName); let project = gApp.mWorkspace.FindProject(projectName);
if (project == null) if (project == null)
{ {
mScriptManager.Fail("Unable to find project '{}'", mScriptManager.mProjectName); mScriptManager.Fail("Unable to find project '{}'", projectName);
return null; return null;
} }
return project; return project;