From ef338cb879a5be27afe978cc6a77517e442dc3a1 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 29 Jul 2023 10:08:33 +0300 Subject: [PATCH] RebuildxPT4TaskMakers.pas --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- ReleaseGenerators/RebuildStandartModules.pas | 5 +++-- ReleaseGenerators/RebuildxPT4TaskMakers.pas | 5 +++++ _GenerateAllSetups.bat | 5 +++++ _RebuildReleaseAndBuildUnits.bat | 3 +++ _RebuildReleaseAndRunTests.bat | 6 ++++++ _RebuildReleaseAndRunTestsForGitHubActions.bat | 6 ++++++ bin/Lib/xPT4MakerNetX.pas | 3 ++- bin/Lib/xPT4TaskMakerNET.pas | 2 ++ 12 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 ReleaseGenerators/RebuildxPT4TaskMakers.pas diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 84a5bfc96..5f0909ff3 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 = "9"; public const string Build = "0"; - public const string Revision = "3316"; + public const string Revision = "3317"; 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 b91c5dfb5..f5b5c3230 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=3316 %MINOR%=9 +%REVISION%=3317 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 9f5165a80..0f40ba6ff 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3316 +3.9.0.3317 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index c298c0700..c49a1ed3f 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3316' +!define VERSION '3.9.0.3317' diff --git a/ReleaseGenerators/RebuildStandartModules.pas b/ReleaseGenerators/RebuildStandartModules.pas index 5d255cc24..1f14b344b 100644 --- a/ReleaseGenerators/RebuildStandartModules.pas +++ b/ReleaseGenerators/RebuildStandartModules.pas @@ -1,4 +1,5 @@ -uses + +uses PABCSystem, PABCExtensions, __RedirectIOMode, __RunMode, ABCButtons, ABCHouse, ABCObjects, ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman, DrawManField, Events, FilesOperations, @@ -10,7 +11,7 @@ WPFObjects, NumLibABC, IniFile, PointerTools, PointRect, - PT4, PT4Exam, xPT4MakerNetX, xPT4TaskMakerNET, + PT4, PT4Exam, PT4MakerNetX, PT4TaskMakerNET, Robot, RobotField, RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, RBDMUtils, Collections, Arrays, Core, FormsABC, MPI, ClientServer, Speech, Sounds, Countries, diff --git a/ReleaseGenerators/RebuildxPT4TaskMakers.pas b/ReleaseGenerators/RebuildxPT4TaskMakers.pas new file mode 100644 index 000000000..19412d1e5 --- /dev/null +++ b/ReleaseGenerators/RebuildxPT4TaskMakers.pas @@ -0,0 +1,5 @@ +uses xPT4MakerNetX, xPT4TaskMakerNET; + +begin + writeln(cos(pi)); +end. \ No newline at end of file diff --git a/_GenerateAllSetups.bat b/_GenerateAllSetups.bat index 8fbbdcc34..da8783d9b 100644 --- a/_GenerateAllSetups.bat +++ b/_GenerateAllSetups.bat @@ -23,6 +23,8 @@ call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET.sln cd ReleaseGenerators ..\bin\pabcnetc RebuildStandartModules.pas /rebuild @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR cd PABCRtl ..\..\bin\pabcnetc PABCRtl.pas /rebuild @@ -38,6 +40,9 @@ ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR + cd ..\bin TestRunner.exe 1 diff --git a/_RebuildReleaseAndBuildUnits.bat b/_RebuildReleaseAndBuildUnits.bat index 1b5c79415..3460221f7 100644 --- a/_RebuildReleaseAndBuildUnits.bat +++ b/_RebuildReleaseAndBuildUnits.bat @@ -20,6 +20,9 @@ ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR + cd ..\bin REM MPGORunner.exe diff --git a/_RebuildReleaseAndRunTests.bat b/_RebuildReleaseAndRunTests.bat index d6fc274a9..cf0cdc36e 100644 --- a/_RebuildReleaseAndRunTests.bat +++ b/_RebuildReleaseAndRunTests.bat @@ -5,6 +5,9 @@ call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CP cd ReleaseGenerators ..\bin\pabcnetc RebuildStandartModules.pas /rebuild @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR + cd PABCRtl ..\..\bin\pabcnetc PABCRtl.pas /rebuild @@ -20,6 +23,9 @@ ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR + cd ..\bin REM MPGORunner.exe diff --git a/_RebuildReleaseAndRunTestsForGitHubActions.bat b/_RebuildReleaseAndRunTestsForGitHubActions.bat index 832abc189..c38538ecb 100644 --- a/_RebuildReleaseAndRunTestsForGitHubActions.bat +++ b/_RebuildReleaseAndRunTestsForGitHubActions.bat @@ -5,6 +5,9 @@ call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CP cd ReleaseGenerators ..\bin\pabcnetc RebuildStandartModules.pas /rebuild /noconsole @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild /noconsole +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR + cd PABCRtl ..\..\bin\pabcnetc PABCRtl.pas /rebuild /noconsole @@ -20,6 +23,9 @@ ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild /noconsole @IF %ERRORLEVEL% NEQ 0 GOTO ERROR +..\bin\pabcnetc RebuildxPT4TaskMakers.pas /rebuild /noconsole +@IF %ERRORLEVEL% NEQ 0 GOTO ERROR + cd ..\bin REM MPGORunner.exe diff --git a/bin/Lib/xPT4MakerNetX.pas b/bin/Lib/xPT4MakerNetX.pas index 3606b9f0a..6125c6bed 100644 --- a/bin/Lib/xPT4MakerNetX.pas +++ b/bin/Lib/xPT4MakerNetX.pas @@ -1,4 +1,5 @@ - +{$reference System.Windows.Forms.dll} + /// Конструктор учебных заданий для задачника Programming Taskbook. /// Версия 1.9 от 26.03.2023 (С) М. Э. Абрамян, 2016-2023. /// Все компоненты конструктора могут вызываться либо как классовые методы класса pt, diff --git a/bin/Lib/xPT4TaskMakerNET.pas b/bin/Lib/xPT4TaskMakerNET.pas index a52495cf4..98151f0e9 100644 --- a/bin/Lib/xPT4TaskMakerNET.pas +++ b/bin/Lib/xPT4TaskMakerNET.pas @@ -1,3 +1,5 @@ +{$reference System.Windows.Forms.dll} + /// Конструктор для электронного задачника Programming Taskbook 4.23 unit xPT4TaskMakerNET;