From d45b782a7bf675be806851bf2f60338f2b9fb9b9 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 4 Jan 2025 18:45:07 +0300 Subject: [PATCH] Rename PABCSistem in test suite --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/LightPT.pas | 5 +++-- TestSuite/CompilationSamples/Turtle.pas | 2 +- .../input/{PABCSystem.pas => PABCSystem2.pas} | 0 7 files changed, 9 insertions(+), 8 deletions(-) rename TestSuite/formatter_tests/input/{PABCSystem.pas => PABCSystem2.pas} (100%) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 6fe860a97..5671ee101 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 = "10"; public const string Build = "2"; - public const string Revision = "3594"; + public const string Revision = "3595"; 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 73d33d4ad..e56660243 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=2 -%REVISION%=3594 %MINOR%=10 +%REVISION%=3595 +%COREVERSION%=2 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 94ecd9c2d..eb52240dc 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.10.2.3594 +3.10.2.3595 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 69e3cff7f..6861012f2 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.10.2.3594' +!define VERSION '3.10.2.3595' diff --git a/TestSuite/CompilationSamples/LightPT.pas b/TestSuite/CompilationSamples/LightPT.pas index 463ffed27..bff538f54 100644 --- a/TestSuite/CompilationSamples/LightPT.pas +++ b/TestSuite/CompilationSamples/LightPT.pas @@ -7,6 +7,9 @@ interface uses System.Runtime.InteropServices; +var + ServerAddr := 'https://air.mmcs.sfedu.ru/pascalabc'; + {==============================================================} { Класс для формирования вывода } {==============================================================} @@ -646,8 +649,6 @@ var LessonName: string := ''; TaskNamesMap := new Dictionary; - ServerAddr := 'https://air.mmcs.sfedu.ru/pascalabc'; - // Дополнительные сообщения о записи в удаленную базу данных additionalMessages := False; diff --git a/TestSuite/CompilationSamples/Turtle.pas b/TestSuite/CompilationSamples/Turtle.pas index 147f6322e..4667a2895 100644 --- a/TestSuite/CompilationSamples/Turtle.pas +++ b/TestSuite/CompilationSamples/Turtle.pas @@ -288,7 +288,7 @@ end; procedure InitOnce; // Это тоже относится к Черепахе begin Window.Title := 'Исполнитель Черепаха'; - Font.Size := 12; + Font.Size := 14; Pen.RoundCap := True; end; diff --git a/TestSuite/formatter_tests/input/PABCSystem.pas b/TestSuite/formatter_tests/input/PABCSystem2.pas similarity index 100% rename from TestSuite/formatter_tests/input/PABCSystem.pas rename to TestSuite/formatter_tests/input/PABCSystem2.pas