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

Version bump to 0.43.6

Browse source
This commit is contained in:
Brian Fiete 2025-03-19 11:01:28 -04:00
parent cf27fffade
commit 1c9d1eeae5
3 changed files with 50 additions and 50 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] [Platform.Windows]
Description = "BeefBuild" Description = "BeefBuild"
FileVersion = "0.43.5" FileVersion = "0.43.6"
[Configs.Debug.Win32] [Configs.Debug.Win32]
TargetName = "" 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" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib"
CLibType = "Dynamic" CLibType = "Dynamic"
BeefLibType = "DynamicDebug" BeefLibType = "DynamicDebug"
DebugCommandArguments = "-proddir=c:\\proj\\BeefTest update BeefProj1" DebugCommandArguments = "-run"
DebugWorkingDirectory = "c:\\beef\\ide" DebugWorkingDirectory = "c:\\proj\\BeefTest"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"] EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
PreprocessorMacros = ["DEBUG", "CLI"] PreprocessorMacros = ["DEBUG", "CLI"]

10
IDE/BeefProj.toml
View file

@ -13,7 +13,7 @@ Description = "Beef IDE"
Company = "BeefyTech LLC" Company = "BeefyTech LLC"
Product = "Beef IDE" Product = "Beef IDE"
Copyright = "Copyright 2019 BeefyTech" Copyright = "Copyright 2019 BeefyTech"
FileVersion = "0.43.5" FileVersion = "0.43.6"
ProductVersion = "0000000000000000" ProductVersion = "0000000000000000"
[Configs.Debug.Win32] [Configs.Debug.Win32]
@ -24,7 +24,7 @@ OtherLinkFlags = ""
TargetDirectory = "$(ProjectDir)/dist" TargetDirectory = "$(ProjectDir)/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"
DebugCommandArguments = "-proddir=\"$(ProjectDir)\\..\\IDE_Ext\"" DebugCommandArguments = "-proddir=\"$(ProjectDir)\\..\\BeefBuild\""
DebugWorkingDirectory = "$(ProjectDir)\\.." DebugWorkingDirectory = "$(ProjectDir)\\.."
EnvironmentVars = ["_NO_DEBUG_HEAP=1"] EnvironmentVars = ["_NO_DEBUG_HEAP=1"]
PreprocessorMacros = ["DEBUG,HASGIT"] PreprocessorMacros = ["DEBUG,HASGIT"]
@ -37,9 +37,9 @@ OtherLinkFlags = ""
TargetDirectory = "$(ProjectDir)/dist" TargetDirectory = "$(ProjectDir)/dist"
TargetName = "BeefIDE" TargetName = "BeefIDE"
OtherLinkFlags = "Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib Beef042RT64.lib IDEHelper64.lib BeefySysLib64.lib" OtherLinkFlags = "Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib Beef042RT64.lib IDEHelper64.lib BeefySysLib64.lib"
DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\Enums.txt -testNoExit" DebugCommandArguments = "-proddir=C:\\Beef\\IDE\\Tests\\Test1 -test=scripts\\Breakpoints.txt"
DebugWorkingDirectory = "$(ProjectDir)\\dist" DebugWorkingDirectory = "$(ProjectDir)\\dist"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"] EnvironmentVars = ["z_NO_DEBUG_HEAP=1"]
PreprocessorMacros = ["RELEASE,HASGIT"] PreprocessorMacros = ["RELEASE,HASGIT"]
[Configs.Debug2.Win32] [Configs.Debug2.Win32]
@ -51,7 +51,7 @@ TargetDirectory = "$(ProjectDir)/dist"
TargetName = "BeefIDE_d2" TargetName = "BeefIDE_d2"
OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib"
BeefLibType = "DynamicDebug" BeefLibType = "DynamicDebug"
DebugCommandArguments = "-workspace=c:\\proj\\ShootGame" DebugCommandArguments = "-workspace=C:\\proj\\BeefTest"
DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest" DebugWorkingDirectory = "c:\\Beef\\IDE\\Tests\\EmptyTest"
EnvironmentVars = ["_NO_DEBUG_HEAP=1"] EnvironmentVars = ["_NO_DEBUG_HEAP=1"]

84
IDE/src/IDEApp.bf
View file

@ -119,7 +119,7 @@ namespace IDE
public class IDEApp : BFApp public class IDEApp : BFApp
{ {
public static String sRTVersionStr = "042"; public static String sRTVersionStr = "042";
public const String cVersion = "0.43.5"; public const String cVersion = "0.43.6";
#if BF_PLATFORM_WINDOWS #if BF_PLATFORM_WINDOWS
public static readonly String sPlatform64Name = "Win64"; public static readonly String sPlatform64Name = "Win64";
@ -259,7 +259,7 @@ namespace IDE
#if IDE_C_SUPPORT #if IDE_C_SUPPORT
public ClangCompiler mDepClang ~ delete _; public ClangCompiler mDepClang ~ delete _;
#endif #endif
// The Beef resolve system is up-to-date with the projects' files, // The Beef resolve system is up-to-date with the projects' files,
// but the Clang resolver only has open files in it // but the Clang resolver only has open files in it
public bool mNoResolve = false; public bool mNoResolve = false;
public bool mDeterministic = false; public bool mDeterministic = false;
@ -320,7 +320,7 @@ namespace IDE
}; };
public int32 mFileDataDataRevision; public int32 mFileDataDataRevision;
/*public Point mLastAbsMousePos; /*public Point mLastAbsMousePos;
public Point mLastRelMousePos; public Point mLastRelMousePos;
public int32 mMouseStillTicks; public int32 mMouseStillTicks;
public Widget mLastMouseWidget;*/ public Widget mLastMouseWidget;*/
@ -791,11 +791,11 @@ namespace IDE
mMainBreakpoint = null; mMainBreakpoint = null;
}*/ }*/
/*delete mBfBuildCompiler; /*delete mBfBuildCompiler;
delete mBfBuildSystem; delete mBfBuildSystem;
delete mDepClang; delete mDepClang;
delete mBfResolveCompiler; delete mBfResolveCompiler;
delete mBfResolveSystem; delete mBfResolveSystem;
delete mResolveClang; delete mResolveClang;
@ -1661,7 +1661,7 @@ namespace IDE
lineEndingKind = editData.mLineEndingKind; lineEndingKind = editData.mLineEndingKind;
} }
// Lock file watcher to synchronize the 'file changed' notification so we don't // Lock file watcher to synchronize the 'file changed' notification so we don't
// think a file was externally saved // think a file was externally saved
using (mFileWatcher.mMonitor.Enter()) using (mFileWatcher.mMonitor.Enter())
{ {
@ -2580,9 +2580,9 @@ namespace IDE
{ {
var sourceViewPanel = tab.mContent as SourceViewPanel; var sourceViewPanel = tab.mContent as SourceViewPanel;
if (sourceViewPanel != null) if (sourceViewPanel != null)
{ {
docPanels.Add(sourceViewPanel); docPanels.Add(sourceViewPanel);
} }
}); });
for (var docPanel in docPanels) for (var docPanel in docPanels)
CloseDocument(docPanel);*/ CloseDocument(docPanel);*/
@ -2812,7 +2812,7 @@ namespace IDE
else else
{ {
int32 spanSize = -cmd; int32 spanSize = -cmd;
charId += spanSize; charId += spanSize;
charIdx += spanSize; charIdx += spanSize;
@ -2919,7 +2919,7 @@ namespace IDE
hadLoad = true; hadLoad = true;
var projectPath = project.mProjectPath; var projectPath = project.mProjectPath;
if (project.mDeferState == .Pending) if (project.mDeferState == .Pending)
{ {
hasDeferredProjects = true; hasDeferredProjects = true;
@ -3332,7 +3332,7 @@ namespace IDE
case .SemVer(let semVer): case .SemVer(let semVer):
// //
case .Git(let url, let ver): case .Git(let url, let ver):
var checkPath = scope String(); var checkPath = scope String();
if (mPackMan.CheckLock(projectName, checkPath, var projectFailed)) if (mPackMan.CheckLock(projectName, checkPath, var projectFailed))
{ {
@ -3867,7 +3867,7 @@ namespace IDE
{ {
#if !CLI #if !CLI
/*SaveFileDialog dialog = scope .(); /*SaveFileDialog dialog = scope .();
let activeWindow = GetActiveWindow(); let activeWindow = GetActiveWindow();
dialog.OverwritePrompt = true; dialog.OverwritePrompt = true;
dialog.SetFilter("Debug Session (*.bfdbg)|*.bfdbg"); dialog.SetFilter("Debug Session (*.bfdbg)|*.bfdbg");
@ -4664,7 +4664,7 @@ namespace IDE
int defLine; int defLine;
int defColumn; int defColumn;
mResolveClang.CancelBackground(); mResolveClang.CancelBackground();
int defIdx = sourceViewPanel.mEditWidget.Content.GetTextIdx(line, lineChar); int defIdx = sourceViewPanel.mEditWidget.Content.GetTextIdx(line, lineChar);
if (mResolveClang.FindDefinition(sourceViewPanel.mFilePath, defIdx, if (mResolveClang.FindDefinition(sourceViewPanel.mFilePath, defIdx,
defFile, out defLine, out defColumn)) defFile, out defLine, out defColumn))
@ -4678,7 +4678,7 @@ namespace IDE
} }
else else
#endif #endif
/*{ /*{
ResolveParams resolveParams = scope ResolveParams(); ResolveParams resolveParams = scope ResolveParams();
sourceViewPanel.Classify(ResolveType.GoToDefinition, resolveParams); sourceViewPanel.Classify(ResolveType.GoToDefinition, resolveParams);
if (resolveParams.mOutFileName != null) if (resolveParams.mOutFileName != null)
@ -7109,7 +7109,7 @@ namespace IDE
mFileEditData.Add(editData); mFileEditData.Add(editData);
projectSource.mEditData = editData; projectSource.mEditData = editData;
projectSource.mEditData.mLastFileTextVersion = projectSource.mEditData.mEditWidget.Content.mData.mCurTextVersionId; projectSource.mEditData.mLastFileTextVersion = projectSource.mEditData.mEditWidget.Content.mData.mCurTextVersionId;
} }
} }
return projectSource.mEditData;*/ return projectSource.mEditData;*/
} }
@ -7512,7 +7512,7 @@ namespace IDE
hasFocus = true; hasFocus = true;
} }
/*if (sourceViewPanel != null) /*if (sourceViewPanel != null)
hasFocus = sourceViewPanel.mEditWidget.mHasFocus;*/ hasFocus = sourceViewPanel.mEditWidget.mHasFocus;*/
if ((sourceViewPanel != null) && (sourceViewPanel.HasUnsavedChanges())) if ((sourceViewPanel != null) && (sourceViewPanel.HasUnsavedChanges()))
@ -9151,8 +9151,8 @@ namespace IDE
/*var buffer = scope String(); /*var buffer = scope String();
if (streamReader.Read(buffer) case .Err) if (streamReader.Read(buffer) case .Err)
break; break;
using (mDebugOutputMonitor.Enter()) using (mDebugOutputMonitor.Enter())
mDebugOutput.Add(new String(buffer));*/ mDebugOutput.Add(new String(buffer));*/
count++; count++;
@ -9174,10 +9174,10 @@ namespace IDE
{ {
var buffer = scope String(); var buffer = scope String();
if (streamReader.ReadLine(buffer) case .Err) if (streamReader.ReadLine(buffer) case .Err)
break; break;
using (IDEApp.sApp.mMonitor.Enter()) using (IDEApp.sApp.mMonitor.Enter())
executionInstance.mDeferredOutput.Add(new String(buffer)); executionInstance.mDeferredOutput.Add(new String(buffer));
} }
}*/ }*/
@ -9479,7 +9479,7 @@ namespace IDE
} }
if ((executionInstance == null) && (mExecutionQueue.Count == 0)) if ((executionInstance == null) && (mExecutionQueue.Count == 0))
{ {
OutputLine("Compilation finished."); OutputLine("Compilation finished.");
}*/ }*/
} }
@ -9762,7 +9762,7 @@ namespace IDE
{ {
mDepClang.QueueCheckDependencies(projectSource, ClangCompiler.DepCheckerType.Clang); mDepClang.QueueCheckDependencies(projectSource, ClangCompiler.DepCheckerType.Clang);
} }
} }
}); });
if (!completedCompileCmd.mFailed) if (!completedCompileCmd.mFailed)
mDepClang.mDoDependencyCheck = false; mDepClang.mDoDependencyCheck = false;
@ -10162,8 +10162,8 @@ namespace IDE
} }
// Project options are inherently thread safe. Resolve-system project settings // Project options are inherently thread safe. Resolve-system project settings
// Can only be changed from the Resolve BfCompiler thread, and Build settings // Can only be changed from the Resolve BfCompiler thread, and Build settings
// are only changed before background compilation begins. We also call this // are only changed before background compilation begins. We also call this
// during WorkspaceLoad, but the resolve threads aren't processing then. // during WorkspaceLoad, but the resolve threads aren't processing then.
public bool SetupBeefProjectSettings(BfSystem bfSystem, BfCompiler bfCompiler, Project project) public bool SetupBeefProjectSettings(BfSystem bfSystem, BfCompiler bfCompiler, Project project)
{ {
@ -10335,7 +10335,7 @@ namespace IDE
string clangArgsStr = String.Join("\n", clangArgs); string clangArgsStr = String.Join("\n", clangArgs);
long hash = 0; long hash = 0;
for (int i = 0; i < clangArgsStr.Length; i++) for (int i = 0; i < clangArgsStr.Length; i++)
hash = (hash << 5) - hash + clangArgsStr[i]; hash = (hash << 5) - hash + clangArgsStr[i];
return String.Format("{0:X16}", hash); return String.Format("{0:X16}", hash);
}*/ }*/
@ -11914,9 +11914,9 @@ namespace IDE
startupCode.AppendF( startupCode.AppendF(
""" """
using System; using System;
namespace {}; namespace {};
class {} class {}
{{ {{
public static int Main(String[] args) public static int Main(String[] args)
@ -12164,7 +12164,7 @@ namespace IDE
String err = String err =
""" """
Beef requires the Microsoft C++ build tools for Visual Studio 2013 or later, but they don't seem to be installed. Beef requires the Microsoft C++ build tools for Visual Studio 2013 or later, but they don't seem to be installed.
Install just Microsoft Visual C++ Build Tools or the entire Visual Studio suite from: Install just Microsoft Visual C++ Build Tools or the entire Visual Studio suite from:
https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022 https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022
"""; """;
@ -12467,8 +12467,8 @@ namespace IDE
if ((mTargetStartWithStep) && (mMainBreakpoint == null)) if ((mTargetStartWithStep) && (mMainBreakpoint == null))
{ {
// The idea is that we don't want to step into static initializers, so we // The idea is that we don't want to step into static initializers, so we
// temporarily break on _main and then we single step // temporarily break on _main and then we single step
//mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv"); //mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv");
if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) || if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) ||
(project.mGeneralOptions.mTargetType == Project.TargetType.BeefGUIApplication)) (project.mGeneralOptions.mTargetType == Project.TargetType.BeefGUIApplication))
@ -13179,7 +13179,7 @@ namespace IDE
/*for (var window in gApp.mWindows) /*for (var window in gApp.mWindows)
{ {
window.SetMinimumSize(GS!()); window.SetMinimumSize(GS!());
}*/ }*/
} }
@ -13610,14 +13610,14 @@ namespace IDE
if (mBfResolveSystem != null) if (mBfResolveSystem != null)
mBfResolveSystem.AddProject(project); mBfResolveSystem.AddProject(project);
} }
foreach (var project in mWorkspace.mProjects) foreach (var project in mWorkspace.mProjects)
{ {
project.WithProjectItems(scope (projectItem) => project.WithProjectItems(scope (projectItem) =>
{ {
var projectSource = projectItem as ProjectSource; var projectSource = projectItem as ProjectSource;
if (projectSource != null) if (projectSource != null)
{ {
var resolveCompiler = GetProjectCompilerForFile(projectSource.mPath); var resolveCompiler = GetProjectCompilerForFile(projectSource.mPath);
if (resolveCompiler == mBfResolveCompiler) if (resolveCompiler == mBfResolveCompiler)
resolveCompiler.QueueProjectSource(projectSource); resolveCompiler.QueueProjectSource(projectSource);
@ -14050,8 +14050,8 @@ namespace IDE
OutputFormatted(deferredOutput, deferredMsgType == "dbgEvalMsg"); OutputFormatted(deferredOutput, deferredMsgType == "dbgEvalMsg");
} }
/*if (hadMessages) /*if (hadMessages)
mNoDebugMessagesTick = 0; mNoDebugMessagesTick = 0;
else if (IDEApp.sApp.mIsUpdateBatchStart) else if (IDEApp.sApp.mIsUpdateBatchStart)
mNoDebugMessagesTick++; mNoDebugMessagesTick++;
if (mNoDebugMessagesTick < 10) if (mNoDebugMessagesTick < 10)
@ -14336,7 +14336,7 @@ namespace IDE
/*public bool CheckMouseover(Widget checkWidget, int32 wantTicks, out Point mousePoint) /*public bool CheckMouseover(Widget checkWidget, int32 wantTicks, out Point mousePoint)
{ {
mousePoint = Point(Int32.MinValue, Int32.MinValue); mousePoint = Point(Int32.MinValue, Int32.MinValue);
if (checkWidget != mLastMouseWidget) if (checkWidget != mLastMouseWidget)
return false; return false;
checkWidget.RootToSelfTranslate(mLastRelMousePos.x, mLastRelMousePos.y, out mousePoint.x, out mousePoint.y); checkWidget.RootToSelfTranslate(mLastRelMousePos.x, mLastRelMousePos.y, out mousePoint.x, out mousePoint.y);
return mMouseStillTicks == wantTicks; return mMouseStillTicks == wantTicks;
@ -14367,7 +14367,7 @@ namespace IDE
foreach (var window in mWindows) foreach (var window in mWindows)
{ {
var widgetWindow = window as WidgetWindow; var widgetWindow = window as WidgetWindow;
widgetWindow.RehupMouse(false); widgetWindow.RehupMouse(false);
var windowOverWidget = widgetWindow.mCaptureWidget ?? widgetWindow.mOverWidget; var windowOverWidget = widgetWindow.mCaptureWidget ?? widgetWindow.mOverWidget;
if ((windowOverWidget != null) && (widgetWindow.mAlpha == 1.0f) && (widgetWindow.mCaptureWidget == null)) if ((windowOverWidget != null) && (widgetWindow.mAlpha == 1.0f) && (widgetWindow.mCaptureWidget == null))
@ -14376,7 +14376,7 @@ namespace IDE
numOverWidgets++; numOverWidgets++;
if (overWidget != mLastMouseWidget) if (overWidget != mLastMouseWidget)
{ {
SetLastMouseWidget(overWidget); SetLastMouseWidget(overWidget);
mMouseStillTicks = -1; mMouseStillTicks = -1;
} }
@ -14394,7 +14394,7 @@ namespace IDE
} }
if (overWidget == null) if (overWidget == null)
{ {
SetLastMouseWidget(null); SetLastMouseWidget(null);
mMouseStillTicks = -1; mMouseStillTicks = -1;
} }
@ -14404,7 +14404,7 @@ namespace IDE
//int a = 0; //int a = 0;
} }
Debug.Assert(numOverWidgets <= 1); Debug.Assert(numOverWidgets <= 1);
}*/ }*/
public void FileRenamed(ProjectFileItem projectFileItem, String oldPath, String newPath) public void FileRenamed(ProjectFileItem projectFileItem, String oldPath, String newPath)