Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-18 16:10:26 +02:00
Code Activity

Fixed hot swapping issue

Browse source
This commit is contained in:
Brian Fiete 2020-02-21 06:52:08 -08:00
parent 7d64d6dd21
commit 8c599ee7db
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
IDE/src/BuildContext.bf
View file

@ -939,13 +939,21 @@ namespace IDE
var bfProject = gApp.mBfBuildSystem.mProjectMap[project]; var bfProject = gApp.mBfBuildSystem.mProjectMap[project];
bool bfHadOutputChanges = false; bool bfHadOutputChanges = false;
List<String> bfFileNames = scope List<String>(); List<String> bfFileNames = scope List<String>();
if (project.mCurBfOutputFileNames == null) if (hotProject == null)
{ {
project.mCurBfOutputFileNames = new .(); if (project.mCurBfOutputFileNames == null)
bfCompiler.GetOutputFileNames(bfProject, true, out bfHadOutputChanges, project.mCurBfOutputFileNames); {
project.mCurBfOutputFileNames = new .();
bfCompiler.GetOutputFileNames(bfProject, true, out bfHadOutputChanges, project.mCurBfOutputFileNames);
}
for (var fileName in project.mCurBfOutputFileNames)
bfFileNames.Add(fileName);
}
else
{
bfCompiler.GetOutputFileNames(bfProject, true, out bfHadOutputChanges, bfFileNames);
defer:: ClearAndDeleteItems(bfFileNames);
} }
for (var fileName in project.mCurBfOutputFileNames)
bfFileNames.Add(fileName);
if (bfHadOutputChanges) if (bfHadOutputChanges)
project.mNeedsTargetRebuild = true; project.mNeedsTargetRebuild = true;
@ -1031,7 +1039,8 @@ namespace IDE
if (project.mGeneralOptions.mTargetType == .CustomBuild) if (project.mGeneralOptions.mTargetType == .CustomBuild)
{ {
DoPostBuild(); if (hotProject == null)
DoPostBuild();
return true; return true;
} }

2
IDE/src/IDEApp.bf
View file

@ -259,7 +259,7 @@ namespace IDE
public bool mStartedWithTestScript; public bool mStartedWithTestScript;
public bool mExitWhenTestScriptDone = true; public bool mExitWhenTestScriptDone = true;
public ScriptManager mScriptManager = new ScriptManager() ~ delete _; public ScriptManager mScriptManager = new ScriptManager() ~ delete _;
public TestManager mTestManager; public TestManager mTestManager ~ delete _;
public bool mExecutionPaused = false; public bool mExecutionPaused = false;
public HotResolveState mHotResolveState; public HotResolveState mHotResolveState;
public int mHotResolveTryIdx; public int mHotResolveTryIdx;