From 9b673bba2f251e7667baf4ac71a3143fc9b2260e Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 19 Nov 2022 21:00:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=20=D0=BE=D0=BA=D0=BD=D0=BE=D0=BC=20About=20=D0=B2=20?= =?UTF-8?q?=D0=9B=D0=B8=D0=BD=D1=83=D0=BA=D1=81-=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=92=20=D0=9C=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=20?= =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=B8=D0=B2=D0=B0=20{$save?= =?UTF-8?q?pcu=20false}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 +- .../Исполнители.pas | 2 + Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNETLinux/AboutBox.cs | 50 +++++++++++-------- 6 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index de73e8923..850d103c9 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "8"; public const string Build = "3"; - public const string Revision = "3204"; + public const string Revision = "3205"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index c67f88019..f3803cf8f 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=3 -%REVISION%=3204 %MINOR%=8 +%REVISION%=3205 +%COREVERSION%=3 %MAJOR%=3 diff --git a/InstallerSamples/!РусскиеИсполнители/Исполнители.pas b/InstallerSamples/!РусскиеИсполнители/Исполнители.pas index 416b55548..b06e0c86e 100644 --- a/InstallerSamples/!РусскиеИсполнители/Исполнители.pas +++ b/InstallerSamples/!РусскиеИсполнители/Исполнители.pas @@ -2,6 +2,8 @@ /// , unit ; +{$savepcu false} + type ///!# = integer; diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 464b85c1b..5b517e281 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.3.3204 +3.8.3.3205 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 62f93bbb0..7c972376f 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.3.3204' +!define VERSION '3.8.3.3205' diff --git a/VisualPascalABCNETLinux/AboutBox.cs b/VisualPascalABCNETLinux/AboutBox.cs index a0e78581b..a9e1e80a8 100644 --- a/VisualPascalABCNETLinux/AboutBox.cs +++ b/VisualPascalABCNETLinux/AboutBox.cs @@ -119,31 +119,37 @@ namespace VisualPascalABC private void AboutBox_Shown(object sender, EventArgs e) { - - lVersion.Text = string.Format("{0}, сборка {1} ({2})", PascalABCCompiler.Compiler.ShortVersion, RevisionClass.Revision, PascalABCCompiler.Compiler.VersionDateTime.ToShortDateString()); - dgvModules.Items.Clear(); - - string apppatch = Path.GetDirectoryName(Application.ExecutablePath); - - VisualEnvironmentCompiler vec = (Owner as Form1).VisualEnvironmentCompiler; - PascalABCCompiler.ICompiler comp = vec.StandartCompiler; - if (comp != null) + try + { + lVersion.Text = string.Format("{0}, сборка {1} ({2})", PascalABCCompiler.Compiler.ShortVersion, RevisionClass.Revision, PascalABCCompiler.Compiler.VersionDateTime.ToShortDateString()); + dgvModules.Items.Clear(); + + string apppatch = Path.GetDirectoryName(Application.ExecutablePath); + + VisualEnvironmentCompiler vec = (Owner as Form1).VisualEnvironmentCompiler; + PascalABCCompiler.ICompiler comp = vec.StandartCompiler; + if (comp != null) + { + Assembly a = Assembly.GetAssembly(comp.GetType()); + dgvModules.Items.Add(MakeItem("Core", "PascalABCCompiler.Core", a.GetName().Version.ToString(), "Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")); + foreach (PascalABCCompiler.Parsers.IParser parser in comp.ParsersController.Parsers) + dgvModules.Items.Add(MakeItem("Parser", parser.Name, parser.Version, parser.Copyright)); + foreach (PascalABCCompiler.SemanticTreeConverters.ISemanticTreeConverter conv in comp.SemanticTreeConvertersController.SemanticTreeConverters) + dgvModules.Items.Add(MakeItem("Converter", conv.Name, conv.Version, conv.Copyright)); + foreach (VisualPascalABCPlugins.IVisualPascalABCPlugin plugin in vec.PluginsController.Plugins) + dgvModules.Items.Add(MakeItem("Plugin", plugin.Name, plugin.Version, plugin.Copyright)); + + } + + //dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"ICSharpCode.TextEditor.dll")))); + //dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"Debugger.Core.dll")))); + //dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"WeifenLuo.WinFormsUI.Docking.dll")))); + ActiveControl = button1; + } + catch { - Assembly a = Assembly.GetAssembly(comp.GetType()); - dgvModules.Items.Add(MakeItem("Core", "PascalABCCompiler.Core", a.GetName().Version.ToString(), "Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich")); - foreach (PascalABCCompiler.Parsers.IParser parser in comp.ParsersController.Parsers) - dgvModules.Items.Add(MakeItem("Parser",parser.Name, parser.Version, parser.Copyright)); - foreach (PascalABCCompiler.SemanticTreeConverters.ISemanticTreeConverter conv in comp.SemanticTreeConvertersController.SemanticTreeConverters) - dgvModules.Items.Add(MakeItem("Converter", conv.Name, conv.Version, conv.Copyright)); - foreach (VisualPascalABCPlugins.IVisualPascalABCPlugin plugin in vec.PluginsController.Plugins) - dgvModules.Items.Add(MakeItem("Plugin",plugin.Name, plugin.Version, plugin.Copyright)); } - - dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"ICSharpCode.TextEditor.dll")))); - dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"Debugger.Core.dll")))); - dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"WeifenLuo.WinFormsUI.Docking.dll")))); - ActiveControl = button1; /*lbComponents.Items.Clear(); PascalABCCompiler.Compiler comp = (Owner as Form1).VisualEnvironmentCompiler.Compiler; if (comp != null)