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

Fixed pause issue running post-build scripts, added curl diagnostics

Browse source
This commit is contained in:
Brian Fiete 2019-09-04 07:00:38 -07:00
parent c5dca50e50
commit 43c82515fe
5 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDE/BeefProj.toml
View file

@ -27,7 +27,7 @@ TargetDirectory = "$(WorkspaceDir)/dist"
TargetName = "BeefIDE_d" TargetName = "BeefIDE_d"
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib"
CLibType = "Dynamic" CLibType = "Dynamic"
DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\HotSwap_Lambdas01.txt -testNoExit" DebugCommandArguments = "-test=scripts\\Minidump.txt -testNoExit -verbosity=Diagnostic"
DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest" DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"] EnvironmentVars = ["_NO_DEBUG_HEAP=1"]

17
IDE/src/IDEApp.bf
View file

@ -51,7 +51,7 @@ namespace IDE
Minimal, Minimal,
Normal, Normal,
Detailed, Detailed,
Diagnostics Diagnostic
} }
class DeferredUserRequest class DeferredUserRequest
@ -6290,8 +6290,8 @@ namespace IDE
mVerbosity = .Normal; mVerbosity = .Normal;
else if (value == "detailed") else if (value == "detailed")
mVerbosity = .Detailed; mVerbosity = .Detailed;
//else if (value == "diagnostic") else if (value == "diagnostic")
//mVerbosity = .Diagnostic; mVerbosity = .Diagnostic;
case "-workspace","-proddir": case "-workspace","-proddir":
var relDir = scope String(value); var relDir = scope String(value);
if ((relDir.EndsWith("\\")) || relDir.EndsWith("\"")) if ((relDir.EndsWith("\\")) || relDir.EndsWith("\""))
@ -10461,7 +10461,16 @@ namespace IDE
} }
else else
cmd.Append(msg); cmd.Append(msg);
if ((cmd == "msg") || (cmd == "dbgEvalMsg") || (cmd == "log"))
bool isOutput = (cmd == "msg") || (cmd == "dbgEvalMsg") || (cmd == "log");
if (cmd == "msgLo")
{
if (mVerbosity <= .Diagnostic)
continue;
isOutput = true;
}
if (isOutput)
{ {
if (deferredMsgType != cmd) if (deferredMsgType != cmd)
{ {

4
IDE/src/ScriptManager.bf
View file

@ -893,7 +893,8 @@ namespace IDE
if (gApp.mLastActiveSourceViewPanel != null) if (gApp.mLastActiveSourceViewPanel != null)
{ {
var sourceViewPanel = gApp.mLastActiveSourceViewPanel; var sourceViewPanel = gApp.mLastActiveSourceViewPanel;
if (sourceViewPanel.HasFocus())
{
if (sourceViewPanel.[Friend]mOldVerLoadExecutionInstance != null) if (sourceViewPanel.[Friend]mOldVerLoadExecutionInstance != null)
return false; return false;
if (!sourceViewPanel.mDeferredResolveResults.IsEmpty) if (!sourceViewPanel.mDeferredResolveResults.IsEmpty)
@ -906,6 +907,7 @@ namespace IDE
if (sourceViewPanel.[Friend]mWantsFullRefresh) if (sourceViewPanel.[Friend]mWantsFullRefresh)
return false; return false;
} }
}
if ((gApp.mBfResolveCompiler != null) && (gApp.mBfResolveCompiler.IsPerformingBackgroundOperation())) if ((gApp.mBfResolveCompiler != null) && (gApp.mBfResolveCompiler.IsPerformingBackgroundOperation()))
return false; return false;

2
IDEHelper/IDEHelper.vcxproj.user
View file

@ -20,6 +20,6 @@
<LocalDebuggerEnvironment>_NO_DEBUG_HEAP=1</LocalDebuggerEnvironment> <LocalDebuggerEnvironment>_NO_DEBUG_HEAP=1</LocalDebuggerEnvironment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ShowAllFiles>true</ShowAllFiles> <ShowAllFiles>false</ShowAllFiles>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

7
IDEHelper/NetManager.cpp
View file

@ -95,6 +95,7 @@ void NetRequest::Perform()
// } // }
BfLogDbg("NetManager starting get on %s\n", mURL.c_str()); BfLogDbg("NetManager starting get on %s\n", mURL.c_str());
mNetManager->mDebugManager->OutputRawMessage(StrFormat("msgLo Getting '%s'\n", mURL.c_str()));
mOutTempPath = mOutPath + "__partial"; mOutTempPath = mOutPath + "__partial";
@ -102,7 +103,6 @@ void NetRequest::Perform()
if (mShowTracking) if (mShowTracking)
{ {
//mNetManager->mDebugManager->OutputMessage(StrFormat("Getting '%s'\n", mURL.c_str()));
mNetManager->mDebugManager->OutputRawMessage(StrFormat("symsrv Getting '%s'", mURL.c_str())); mNetManager->mDebugManager->OutputRawMessage(StrFormat("symsrv Getting '%s'", mURL.c_str()));
} }
@ -125,6 +125,7 @@ void NetRequest::Perform()
long response_code = 0; long response_code = 0;
curl_easy_getinfo(mCURL, CURLINFO_RESPONSE_CODE, &response_code); curl_easy_getinfo(mCURL, CURLINFO_RESPONSE_CODE, &response_code);
mNetManager->mDebugManager->OutputRawMessage(StrFormat("msgLo Result for '%s': %d\n", mURL.c_str(), response_code));
if (response_code != 200) if (response_code != 200)
{ {
mOutFile.Close(); mOutFile.Close();
@ -150,8 +151,10 @@ void NetRequest::Perform()
BfpFile_Rename(mOutTempPath.c_str(), mOutPath.c_str(), &renameResult); BfpFile_Rename(mOutTempPath.c_str(), mOutPath.c_str(), &renameResult);
if (renameResult != BfpFileResult_Ok) if (renameResult != BfpFileResult_Ok)
{
mFailed = true; mFailed = true;
} }
}
#else #else
@ -479,6 +482,8 @@ bool NetManager::Get(const StringImpl& url, const StringImpl& destPath)
delete netRequest; delete netRequest;
BfLogDbg("NetManager::Get requested %s: %d\n", url.c_str(), !netResult->mFailed); BfLogDbg("NetManager::Get requested %s: %d\n", url.c_str(), !netResult->mFailed);
mDebugManager->OutputRawMessage(StrFormat("msgLo Result for '%s': %d\n", url.c_str(), !netResult->mFailed));
return (!netResult->mFailed) && (FileExists(netResult->mOutPath)); return (!netResult->mFailed) && (FileExists(netResult->mOutPath));
} }