From 60799b031b9b1d9afafcd9be93b8c5b28035d850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B5=D0=BC=D0=BB=D1=8F=D0=BA?= <92867056+AlexanderZemlyak@users.noreply.github.com> Date: Thu, 9 Apr 2026 09:45:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20pcu=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=20SPython=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D0=B8=D1=85=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=86=D0=B8=D0=B5?= =?UTF-8?q?=D0=B9=20=D0=B2=20bat=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=D1=85=20?= =?UTF-8?q?(#3407)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Return rebuild for RebuildStandartModulesSPython * Add SPython pcu files deletion command in bat files * Fix linux sh script for SPython modules --- _GenerateAllSetups.bat | 10 ++++++++-- _RebuildReleaseAndRunTests.bat | 10 ++++++++-- _RebuildReleaseAndRunTests.sh | 4 +++- _RebuildReleaseAndRunTestsForGitHubActions.bat | 10 ++++++++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/_GenerateAllSetups.bat b/_GenerateAllSetups.bat index f2c81dd4d..3259b5b03 100644 --- a/_GenerateAllSetups.bat +++ b/_GenerateAllSetups.bat @@ -18,8 +18,11 @@ dotnet build -c Release --no-incremental PascalABCNET.sln cd ReleaseGenerators ..\bin\pabcnetc RebuildStandartModules.pas /rebuild -rem /rebuild здесь пока нельзя + +rem Удаляем pcu для SPython модулей, чтобы не применять /rebuild +del "..\bin\Lib\SPython\*.pcu" /q ..\bin\pabcnetc RebuildStandartModulesSPython.pas + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR cd PABCRtl @@ -35,8 +38,11 @@ ExecHide.exe gacutil.exe /u PABCRtl ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild -rem /rebuild здесь пока нельзя + +rem Удаляем pcu для SPython модулей, чтобы не применять /rebuild +del "..\bin\Lib\SPython\*.pcu" /q ..\bin\pabcnetc RebuildStandartModulesSPython.pas + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR diff --git a/_RebuildReleaseAndRunTests.bat b/_RebuildReleaseAndRunTests.bat index 710cfe313..f9efb9781 100644 --- a/_RebuildReleaseAndRunTests.bat +++ b/_RebuildReleaseAndRunTests.bat @@ -4,8 +4,11 @@ dotnet build -c Release --no-incremental PascalABCNET.sln cd ReleaseGenerators ..\bin\pabcnetc RebuildStandartModules.pas /rebuild -rem /rebuild здесь пока нельзя + +rem Удаляем pcu для SPython модулей, чтобы не применять /rebuild +del "..\bin\Lib\SPython\*.pcu" /q ..\bin\pabcnetc RebuildStandartModulesSPython.pas + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR @@ -22,8 +25,11 @@ ExecHide.exe gacutil.exe /u PABCRtl ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild -rem /rebuild здесь пока нельзя + +rem Удаляем pcu для SPython модулей, чтобы не применять /rebuild +del "..\bin\Lib\SPython\*.pcu" /q ..\bin\pabcnetc RebuildStandartModulesSPython.pas + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR diff --git a/_RebuildReleaseAndRunTests.sh b/_RebuildReleaseAndRunTests.sh index d7f3596ba..fa287b9d4 100644 --- a/_RebuildReleaseAndRunTests.sh +++ b/_RebuildReleaseAndRunTests.sh @@ -18,7 +18,9 @@ mono --aot bin/PascalABCLanguageInfo.dll cd ReleaseGenerators mono ../bin/pabcnetc.exe RebuildStandartModulesMono.pas /rebuild -# /rebuild здесь пока нельзя + +# Удаляем pcu для SPython модулей, чтобы не применять /rebuild +rm -f ../bin/Lib/SPython/*.pcu mono ../bin/pabcnetc RebuildStandartModulesSPython.pas if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then diff --git a/_RebuildReleaseAndRunTestsForGitHubActions.bat b/_RebuildReleaseAndRunTestsForGitHubActions.bat index 7f711b401..bddbc9de4 100644 --- a/_RebuildReleaseAndRunTestsForGitHubActions.bat +++ b/_RebuildReleaseAndRunTestsForGitHubActions.bat @@ -4,8 +4,11 @@ dotnet build -c Release PascalABCNET.sln cd ReleaseGenerators ..\bin\pabcnetc RebuildStandartModules.pas /rebuild /noconsole -rem /rebuild здесь пока нельзя + +rem Удаляем pcu для SPython модулей, чтобы не применять /rebuild +del "..\bin\Lib\SPython\*.pcu" /q ..\bin\pabcnetc RebuildStandartModulesSPython.pas /noconsole + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR @@ -22,8 +25,11 @@ ExecHide.exe gacutil.exe /u PABCRtl ExecHide.exe gacutil.exe /i ..\bin\Lib\PABCRtl.dll ..\bin\pabcnetc RebuildStandartModules.pas /rebuild /noconsole -rem /rebuild здесь пока нельзя + +rem Удаляем pcu для SPython модулей, чтобы не применять /rebuild +del "..\bin\Lib\SPython\*.pcu" /q ..\bin\pabcnetc RebuildStandartModulesSPython.pas /noconsole + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR