Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 03:28: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"
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib"
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"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"]

17
IDE/src/IDEApp.bf
View file

@ -51,7 +51,7 @@ namespace IDE
Minimal,
Normal,
Detailed,
Diagnostics
Diagnostic
}
class DeferredUserRequest
@ -6290,8 +6290,8 @@ namespace IDE
mVerbosity = .Normal;
else if (value == "detailed")
mVerbosity = .Detailed;
//else if (value == "diagnostic")
//mVerbosity = .Diagnostic;
else if (value == "diagnostic")
mVerbosity = .Diagnostic;
case "-workspace","-proddir":
var relDir = scope String(value);
if ((relDir.EndsWith("\\")) || relDir.EndsWith("\""))
@ -10461,7 +10461,16 @@ namespace IDE
}
else
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)
{

24
IDE/src/ScriptManager.bf
View file

@ -893,18 +893,20 @@ namespace IDE
if (gApp.mLastActiveSourceViewPanel != null)
{
var sourceViewPanel = gApp.mLastActiveSourceViewPanel;
if (sourceViewPanel.HasFocus())
{
if (sourceViewPanel.[Friend]mOldVerLoadExecutionInstance != null)
return false;
if (!sourceViewPanel.mDeferredResolveResults.IsEmpty)
return false;
if (sourceViewPanel.[Friend]mOldVerLoadExecutionInstance != null)
return false;
if (!sourceViewPanel.mDeferredResolveResults.IsEmpty)
return false;
if (sourceViewPanel.[Friend]mWantsFastClassify)
return false;
if (sourceViewPanel.[Friend]mWantsFullClassify)
return false;
if (sourceViewPanel.[Friend]mWantsFullRefresh)
return false;
if (sourceViewPanel.[Friend]mWantsFastClassify)
return false;
if (sourceViewPanel.[Friend]mWantsFullClassify)
return false;
if (sourceViewPanel.[Friend]mWantsFullRefresh)
return false;
}
}
if ((gApp.mBfResolveCompiler != null) && (gApp.mBfResolveCompiler.IsPerformingBackgroundOperation()))

2
IDEHelper/IDEHelper.vcxproj.user
View file

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

13
IDEHelper/NetManager.cpp
View file

@ -95,14 +95,14 @@ void NetRequest::Perform()
// }
BfLogDbg("NetManager starting get on %s\n", mURL.c_str());
mNetManager->mDebugManager->OutputRawMessage(StrFormat("msgLo Getting '%s'\n", mURL.c_str()));
mOutTempPath = mOutPath + "__partial";
mCURL = curl_easy_init();
if (mShowTracking)
{
//mNetManager->mDebugManager->OutputMessage(StrFormat("Getting '%s'\n", mURL.c_str()));
{
mNetManager->mDebugManager->OutputRawMessage(StrFormat("symsrv Getting '%s'", mURL.c_str()));
}
@ -125,8 +125,9 @@ void NetRequest::Perform()
long response_code = 0;
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)
{
{
mOutFile.Close();
// Bad result
mFailed = true;
@ -139,7 +140,7 @@ void NetRequest::Perform()
mNetManager->Cancel(mCancelOnSuccess);
if (!mOutFile.IsOpen())
{
{
mFailed = true;
return; // No data
}
@ -150,7 +151,9 @@ void NetRequest::Perform()
BfpFile_Rename(mOutTempPath.c_str(), mOutPath.c_str(), &renameResult);
if (renameResult != BfpFileResult_Ok)
{
mFailed = true;
}
}
#else
@ -479,6 +482,8 @@ bool NetManager::Get(const StringImpl& url, const StringImpl& destPath)
delete netRequest;
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));
}