From 8d7a144ccd79cb47391544d80f7191797f7de53f Mon Sep 17 00:00:00 2001 From: Matteo Salvi Date: Sun, 29 Sep 2024 01:47:04 +0200 Subject: [PATCH] build: Updated Lazarus to 3.4.0 and some 3p components --- .github/workflows/main.yml | 18 +++++++++--------- .github/workflows/main_release.yml | 18 +++++++++--------- .gitmodules | 6 +++--- 3p/GDIPlus-Library-for-Delphi-and-Lazarus | 1 + 3p/IGDIPlusMod | 1 - 3p/JPLib | 2 +- 3p/JPPack | 2 +- 3p/VirtualTreeView-Lazarus | 2 +- 3p/bgrabitmap | 2 +- 3p/bgracontrols | 2 +- utils/installPackages.ps1 | 4 +--- 11 files changed, 28 insertions(+), 30 deletions(-) create mode 160000 3p/GDIPlus-Library-for-Delphi-and-Lazarus delete mode 160000 3p/IGDIPlusMod diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27a5de27..d38228df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ env: FPC_URL: 'gitlab' FPC_BRANCH: 'release_3_2_2' LAZ_URL: 'gitlab' - LAZ_BRANCH: 'lazarus_3_2' + LAZ_BRANCH: 'lazarus_3_4' LAZ_REVISION_2_4: '' LAZ_DIR: 'fpcLaz' BUILD_MODE: 'Debug_GH_Action' @@ -44,7 +44,7 @@ jobs: - os: windows-latest name: 'Windows 64' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-win64.exe' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-win64.exe' lazbuild: 'fpcLaz/lazarus/lazbuild.exe' dbg2mab: 'dbg2mab.exe' build-widgetset: 'win32' @@ -53,7 +53,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK2' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk2' @@ -62,7 +62,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK3' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk3' @@ -71,7 +71,7 @@ jobs: - os: ubuntu-20.04 name: 'Linux 64 QT5' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt5' @@ -80,7 +80,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 QT6' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt6' @@ -90,7 +90,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.2.0 with: submodules: true path: '${{ env.ASUITE_SOURCE }}' @@ -131,7 +131,7 @@ jobs: - name: Cache id: cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v4.0.2 env: cache-name: cache-laz-v0.6.1 with: @@ -168,7 +168,7 @@ jobs: run: ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.dbg2mab }} ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.debug_file }} - name: Upload the Build Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4.4.0 with: name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }} path: | diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml index 20b2287c..d6a65970 100644 --- a/.github/workflows/main_release.yml +++ b/.github/workflows/main_release.yml @@ -15,7 +15,7 @@ env: FPC_URL: 'gitlab' FPC_BRANCH: 'release_3_2_2' LAZ_URL: 'gitlab' - LAZ_BRANCH: 'lazarus_3_2' + LAZ_BRANCH: 'lazarus_3_4' LAZ_REVISION_2_4: '' LAZ_DIR: 'fpcLaz' BUILD_MODE: 'Debug_GH_Action' @@ -40,7 +40,7 @@ jobs: - os: windows-latest name: 'Windows 64' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-win64.exe' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-win64.exe' lazbuild: 'fpcLaz/lazarus/lazbuild.exe' dbg2mab: 'dbg2mab.exe' build-widgetset: 'win32' @@ -49,7 +49,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK2' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk2' @@ -58,7 +58,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 GTK3' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'gtk3' @@ -67,7 +67,7 @@ jobs: - os: ubuntu-20.04 name: 'Linux 64 QT5' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt5' @@ -76,7 +76,7 @@ jobs: - os: ubuntu-22.04 name: 'Linux 64 QT6' - fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux' + fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux' lazbuild: 'fpcLaz/lazarus/lazbuild' dbg2mab: 'dbg2mab' build-widgetset: 'qt6' @@ -86,7 +86,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4.2.0 with: submodules: true path: '${{ env.ASUITE_SOURCE }}' @@ -127,7 +127,7 @@ jobs: - name: Cache id: cache - uses: actions/cache@v3.0.11 + uses: actions/cache@v4.0.2 env: cache-name: cache-laz-v0.6.1 with: @@ -164,7 +164,7 @@ jobs: run: ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.dbg2mab }} ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.debug_file }} - name: Upload the Build Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v4.4.0 with: name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }} path: | diff --git a/.gitmodules b/.gitmodules index ed8a1fcc..b1c7567c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,9 +22,9 @@ [submodule "3p/bgracontrols"] path = 3p/bgracontrols url = https://github.com/bgrabitmap/bgracontrols.git -[submodule "3p/IGDIPlusMod"] - path = 3p/IGDIPlusMod - url = https://github.com/jackdp/IGDIPlusMod [submodule "3p/mORMot2"] path = 3p/mORMot2 url = https://github.com/synopse/mORMot2.git +[submodule "3p/GDIPlus-Library-for-Delphi-and-Lazarus"] + path = 3p/GDIPlus-Library-for-Delphi-and-Lazarus + url = https://github.com/jackdp/GDIPlus-Library-for-Delphi-and-Lazarus diff --git a/3p/GDIPlus-Library-for-Delphi-and-Lazarus b/3p/GDIPlus-Library-for-Delphi-and-Lazarus new file mode 160000 index 00000000..7f5053e1 --- /dev/null +++ b/3p/GDIPlus-Library-for-Delphi-and-Lazarus @@ -0,0 +1 @@ +Subproject commit 7f5053e1ad1c9013fe6a9d2360d025726aadb79a diff --git a/3p/IGDIPlusMod b/3p/IGDIPlusMod deleted file mode 160000 index 9e24c493..00000000 --- a/3p/IGDIPlusMod +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e24c4932de730813f4972426519829ee22c5e26 diff --git a/3p/JPLib b/3p/JPLib index e70dfbfb..f7ee7afd 160000 --- a/3p/JPLib +++ b/3p/JPLib @@ -1 +1 @@ -Subproject commit e70dfbfb7c4c6a7bcddbb6d4ab4dca0bc372784d +Subproject commit f7ee7afde9ed6f65789dea31e484941bb428dc49 diff --git a/3p/JPPack b/3p/JPPack index 63fd4017..6c67646b 160000 --- a/3p/JPPack +++ b/3p/JPPack @@ -1 +1 @@ -Subproject commit 63fd4017182a0befc972d6fd6720abf02f4089d6 +Subproject commit 6c67646b980403b53268d1552474005e55b263f5 diff --git a/3p/VirtualTreeView-Lazarus b/3p/VirtualTreeView-Lazarus index 407238eb..1d70f19b 160000 --- a/3p/VirtualTreeView-Lazarus +++ b/3p/VirtualTreeView-Lazarus @@ -1 +1 @@ -Subproject commit 407238ebf207693431e7c49b6856cd7339b00b87 +Subproject commit 1d70f19b56797c0459d74036ae04537b1453c016 diff --git a/3p/bgrabitmap b/3p/bgrabitmap index 2fdbbea4..f9748a37 160000 --- a/3p/bgrabitmap +++ b/3p/bgrabitmap @@ -1 +1 @@ -Subproject commit 2fdbbea4beacf1fadc0a2cd61f23a0dd618bfbdb +Subproject commit f9748a37f5382b18d1cd197293d1032a522e8561 diff --git a/3p/bgracontrols b/3p/bgracontrols index 3e54a921..f5efbf8b 160000 --- a/3p/bgracontrols +++ b/3p/bgracontrols @@ -1 +1 @@ -Subproject commit 3e54a92183df40fc61ff4765684c8a5cb41f4271 +Subproject commit f5efbf8b79d0725d33b88c5bd41857d9139428bd diff --git a/utils/installPackages.ps1 b/utils/installPackages.ps1 index 74202bca..9221439d 100644 --- a/utils/installPackages.ps1 +++ b/utils/installPackages.ps1 @@ -44,10 +44,8 @@ if ($RemoveSparta) { # Install Lazarus Components write-output "Installing Lazarus Components for building ASuite" InstallPackageLink $LazBuildPath "$ASuiteSource/3p/bgrabitmap/bgrabitmap/bgrabitmappack.lpk" -InstallPackage $LazBuildPath "$ASuiteSource/3p/bgrabitmap/bglcontrols/bglcontrols.lpk" InstallPackage $LazBuildPath "$ASuiteSource/3p/bgracontrols/bgracontrols.lpk" -InstallPackage $LazBuildPath "$ASuiteSource/3p/bgracontrols/bgrapascalscriptcomponent.lpk" -InstallPackage $LazBuildPath "$ASuiteSource/3p/IGDIPlusMod/packages/Lazarus/lazigdiplus.lpk" +InstallPackage $LazBuildPath "$ASuiteSource/3p/GDIPlus-Library-for-Delphi-and-Lazarus/packages/Lazarus/lazgdiplus.lpk" InstallPackage $LazBuildPath "$ASuiteSource/3p/JPLib/packages/Lazarus/jplib.lpk" InstallPackage $LazBuildPath "$ASuiteSource/3p/JPPack/packages/Lazarus/jppacklcl.lpk" InstallPackageLink $LazBuildPath "$ASuiteSource/3p/mORMot2/packages/lazarus/mormot2.lpk"