Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-06 08:15:59 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into Yuvan/CustomBuildProperties

Browse source
This commit is contained in:
LAPTOP-NV8MPI8C\Yuvan Wickramasinghe 2025-03-28 14:48:45 -07:00
commit 4b879670ca
No known key found for this signature in database
294 changed files with 15180 additions and 4106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BeefBuild/BeefProj.toml
View file

@ -7,7 +7,7 @@ StartupObject = "BeefBuild.Program"
[Platform.Windows]
Description = "BeefBuild"
FileVersion = "0.43.5"
FileVersion = "0.43.6"
[Configs.Debug.Win32]
TargetName = ""
@ -19,8 +19,8 @@ TargetName = "$(ProjectName)_d"
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib"
CLibType = "Dynamic"
BeefLibType = "DynamicDebug"
DebugCommandArguments = "-proddir=c:\\proj\\BeefTest update BeefProj1"
DebugWorkingDirectory = "c:\\beef\\ide"
DebugCommandArguments = "-run"
DebugWorkingDirectory = "c:\\proj\\BeefTest"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
PreprocessorMacros = ["DEBUG", "CLI"]

12
BeefBuild/src/BuildApp.bf
View file

@ -25,6 +25,7 @@ namespace BeefBuild
public bool mWantsGenerate = false;
public bool mHandledVerb;
public String mRunArgs ~ delete _;
public String mStartingDirectory = new .() ~ delete _;
MainVerbState mMainVerbState;
/*void Test()
@ -57,6 +58,8 @@ namespace BeefBuild
public override void Init()
{
Directory.GetCurrentDirectory(mStartingDirectory);
GetVersionInfo(var exeTime);
if (mVerbosity == .Default)
@ -388,9 +391,9 @@ namespace BeefBuild
mFailed = true;
}
protected override void CompileFailed()
protected override void CompileFailed(Stopwatch stopwatch)
{
base.CompileFailed();
base.CompileFailed(stopwatch);
mFailed = true;
}
@ -434,9 +437,6 @@ namespace BeefBuild
{
if ((mVerb == .Run) && (!mDidRun) && (!mFailed))
{
let curPath = scope String();
Directory.GetCurrentDirectory(curPath);
let workspaceOptions = gApp.GetCurWorkspaceOptions();
let options = gApp.GetCurProjectOptions(mWorkspace.mStartupProject);
let targetPaths = scope List<String>();
@ -445,7 +445,7 @@ namespace BeefBuild
if (targetPaths.IsEmpty)
return;
ExecutionQueueCmd executionCmd = QueueRun(targetPaths[0], mRunArgs ?? "", curPath);
ExecutionQueueCmd executionCmd = QueueRun(targetPaths[0], mRunArgs ?? "", mStartingDirectory);
executionCmd.mRunFlags |= .NoRedirect;
executionCmd.mIsTargetRun = true;
mDidRun = true;

2
BeefBuild/src/Program.bf
View file

@ -31,7 +31,7 @@ namespace BeefBuild
//TestZip2();
String commandLine = scope String();
commandLine.Join(" ", params args);
commandLine.Join(" ", args);
BuildApp mApp = new BuildApp();
mApp.ParseCommandLine(commandLine);