build: Updated Lazarus to 3.0.0, mORMot 2.2, VTV 8.0 experimental

salvadorbs · Jan 19, 2024 · 39542ff · 39542ff
1 parent aab5c60
commit 39542ff
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 49 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,12 +19,12 @@ env:
   FPC_URL: 'gitlab'
   FPC_BRANCH: 'release_3_2_2'
   LAZ_URL: 'gitlab'
-  LAZ_BRANCH: 'lazarus_3_0_RC1'
-  LAZ_REVISION_2_4: '0a3429053c0dfcae2359e3b0b62e1763d5e6a319'
+  LAZ_BRANCH: 'lazarus_3_0'
+  LAZ_REVISION_2_4: ''
   LAZ_DIR: 'fpcLaz'
   BUILD_MODE: 'Debug_GH_Action'   
   FPCUP_OPT: '' #'--lazopt="-g -gl" --fpcopt="-g -gl"'
-  LAZ_PATCH: '/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
+  LAZ_PATCH: '' #'/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
   ASUITE_SOURCE: 'asuite_src'
 
 jobs:
@@ -44,16 +44,34 @@ jobs:
 
           - os: windows-latest
             name: 'Windows 64'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-win64.exe'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
             lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
             dbg2mab: 'dbg2mab.exe'
             build-widgetset: 'win32'
             build-os: 'win64'
             debug_file: 'ASuite.dbg'
 
+          - os: windows-latest
+            name: 'Windows 64 QT5'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
+            lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
+            dbg2mab: 'dbg2mab.exe'
+            build-widgetset: 'qt5'
+            build-os: 'win64'
+            debug_file: 'ASuite.dbg'
+
+          - os: windows-latest
+            name: 'Windows 64 QT6'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
+            lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
+            dbg2mab: 'dbg2mab.exe'
+            build-widgetset: 'qt6'
+            build-os: 'win64'
+            debug_file: 'ASuite.dbg'
+
           - os: ubuntu-22.04
             name: 'Linux 64 GTK2'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk2'
@@ -62,7 +80,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK3'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk3'
@@ -71,7 +89,7 @@ jobs:
 
           - os: ubuntu-20.04
             name: 'Linux 64 QT5'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt5'
@@ -80,7 +98,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 QT6'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt6'
@@ -109,24 +127,22 @@ jobs:
     - name: Install Dependencies (Ubuntu - only QT5)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'qt5'
       run: |
-        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.13/libqt5pas1_2.13-1_amd64.deb
-        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.13/libqt5pas-dev_2.13-1_amd64.deb
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas1_2.15-1_amd64.deb
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas-dev_2.15-1_amd64.deb
+        sudo apt-get update
         sudo apt-get -m -y install qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev
-        sudo dpkg -i libqt5pas1_2.13-1_amd64.deb
-        sudo dpkg -i libqt5pas-dev_2.13-1_amd64.deb
-        cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
-        qmake
-        make
-        sudo make install
+        sudo apt-get -m -y install ./libqt5pas1_2.15-1_amd64.deb
+        sudo apt-get -m -y install ./libqt5pas-dev_2.15-1_amd64.deb
         
     - name: Install Dependencies (Ubuntu - only QT6)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6'
       run: |
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.6/libqt6pas6_6.2.6-1_amd64.deb
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.6/libqt6pas6-dev_6.2.6-1_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6_6.2.7-1_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6-dev_6.2.7-1_amd64.deb
+        sudo apt-get update
         sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev
-        sudo dpkg -i libqt6pas6_6.2.6-1_amd64.deb
-        sudo dpkg -i libqt6pas6-dev_6.2.6-1_amd64.deb
+        sudo apt-get -m -y install ./libqt6pas6_6.2.7-1_amd64.deb
+        sudo apt-get -m -y install ./libqt6pas6-dev_6.2.7-1_amd64.deb
 
     - name: Generate Cache Hash
       run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_REVISION_2_4 }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache
@@ -175,4 +191,3 @@ jobs:
         name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }}
         path: |
           ${{ env.ASUITE_SOURCE}}/bin
-          ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas/libQGHotkeyHookPas.so*
diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
@@ -15,12 +15,12 @@ env:
   FPC_URL: 'gitlab'
   FPC_BRANCH: 'release_3_2_2'
   LAZ_URL: 'gitlab'
-  LAZ_BRANCH: 'lazarus_3_0_RC1'
+  LAZ_BRANCH: 'lazarus_3_0'
   LAZ_REVISION_2_4: ''
   LAZ_DIR: 'fpcLaz'
   BUILD_MODE: 'Release'   
   FPCUP_OPT: ''
-  LAZ_PATCH: '/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
+  LAZ_PATCH: '' #'/3p/patch/lazarus_popupmenu_click.patch' #For Lazarus 2.2
   ASUITE_SOURCE: 'asuite_src'
 
 jobs:
@@ -40,16 +40,34 @@ jobs:
 
           - os: windows-latest
             name: 'Windows 64'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-win64.exe'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
             lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
             dbg2mab: 'dbg2mab.exe'
             build-widgetset: 'win32'
             build-os: 'win64'
             debug_file: 'ASuite.dbg'
 
+          - os: windows-latest
+            name: 'Windows 64 QT5'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
+            lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
+            dbg2mab: 'dbg2mab.exe'
+            build-widgetset: 'qt5'
+            build-os: 'win64'
+            debug_file: 'ASuite.dbg'
+
+          - os: windows-latest
+            name: 'Windows 64 QT6'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-win64.exe'
+            lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
+            dbg2mab: 'dbg2mab.exe'
+            build-widgetset: 'qt6'
+            build-os: 'win64'
+            debug_file: 'ASuite.dbg'
+
           - os: ubuntu-22.04
             name: 'Linux 64 GTK2'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk2'
@@ -58,7 +76,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK3'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk3'
@@ -67,7 +85,7 @@ jobs:
 
           - os: ubuntu-20.04
             name: 'Linux 64 QT5'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt5'
@@ -76,7 +94,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 QT6'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0s/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0nf/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt6'
@@ -105,28 +123,22 @@ jobs:
     - name: Install Dependencies (Ubuntu - only QT5)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-20.04') && matrix.config.build-widgetset == 'qt5'
       run: |
-        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.13/libqt5pas1_2.13-1_amd64.deb
-        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.13/libqt5pas-dev_2.13-1_amd64.deb
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas1_2.15-1_amd64.deb
+        wget https://github.com/davidbannon/libqt5pas/releases/download/v1.2.15/libqt5pas-dev_2.15-1_amd64.deb
+        sudo apt-get update
         sudo apt-get -m -y install qt5-qmake qtbase5-dev qt5-default libqt5x11extras5-dev libxcb-keysyms1-dev
-        sudo dpkg -i libqt5pas1_2.13-1_amd64.deb
-        sudo dpkg -i libqt5pas-dev_2.13-1_amd64.deb
-        cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
-        qmake
-        make
-        sudo make install
-
+        sudo apt-get -m -y install ./libqt5pas1_2.15-1_amd64.deb
+        sudo apt-get -m -y install ./libqt5pas-dev_2.15-1_amd64.deb
+        
     - name: Install Dependencies (Ubuntu - only QT6)
       if: (matrix.config.os == 'ubuntu-latest' || matrix.config.os == 'ubuntu-22.04') && matrix.config.build-widgetset == 'qt6'
       run: |
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6_6.2.2-2_amd64.deb
-        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.2/libqt6pas6-dev_6.2.2-2_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6_6.2.7-1_amd64.deb
+        wget https://github.com/davidbannon/libqt6pas/releases/download/v6.2.7/libqt6pas6-dev_6.2.7-1_amd64.deb
+        sudo apt-get update
         sudo apt-get -m -y install qt6-base-dev libxcb-keysyms1-dev libgl-dev qt6-base-private-dev
-        sudo dpkg -i libqt6pas6_6.2.2-2_amd64.deb
-        sudo dpkg -i libqt6pas6-dev_6.2.2-2_amd64.deb
-        cd ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas
-        qmake6
-        make
-        sudo make install
+        sudo apt-get -m -y install ./libqt6pas6_6.2.7-1_amd64.deb
+        sudo apt-get -m -y install ./libqt6pas6-dev_6.2.7-1_amd64.deb
 
     - name: Generate Cache Hash
       run: echo "${{ matrix.config.fpcup-url }}${{ env.FPCUP_OPT }}${{ env.FPC_URL }}${{ env.FPC_BRANCH }}${{ env.LAZ_URL }}${{ env.LAZ_BRANCH }}${{ env.LAZ_REVISION_2_4 }}${{ env.LAZ_PATCH}}${{ matrix.config.name }}" > .cache
@@ -175,4 +187,3 @@ jobs:
         name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }}
         path: |
           ${{ env.ASUITE_SOURCE}}/bin
-          ${{ env.ASUITE_SOURCE }}/3p/AsuiteComps/library/platform/unix/QGHotkeyHookPas/libQGHotkeyHookPas.so*
diff --git a/3p/VirtualTreeView-Lazarus b/3p/VirtualTreeView-Lazarus
diff --git a/3p/mORMot2 b/3p/mORMot2
diff --git a/utils/installPackages.ps1 b/utils/installPackages.ps1
@@ -58,7 +58,7 @@ InstallPackage $LazBuildPath "$ASuiteSource/3p/VirtualTreeView-Lazarus/Packages/
 InstallPackage $LazBuildPath "$ASuiteSource/3p/AsuiteComps/ASuiteComps.lpk"
 
 # Download mORMot 2 Static files and extract them in proper directory
-$Url = 'https://github.com/synopse/mORMot2/releases/download/2.1.stable/mormot2static.7z' 
+$Url = 'https://github.com/synopse/mORMot2/releases/download/2.2.stable/mormot2static.7z' 
 $ZipFile = $(Split-Path -Path $Url -Leaf) 
 $Destination = $ASuiteSource + '/3p/mORMot2/static/'
 $pwd = Get-Location
+20 −13		.github/workflows/main.yml
+9 −4		Demos/Minimal/Main.lfm
+1 −1		Demos/OLE/Main.pas
+13 −2		Demos/dragdrop/fmain.lfm
+1 −1		Demos/dragdrop/fmain.pas
+13 −0		Doc/Class inheritance.txt
+13 −5		Source/VTConfig.inc
+194 −76		Source/VirtualTrees.Accessibility.pas
+82 −28		Source/VirtualTrees.AccessibilityFactory.pas
+0 −1		Source/VirtualTrees.Actions.pas
+369 −230		Source/VirtualTrees.AncestorLcl.pas
+368 −19		Source/VirtualTrees.BaseAncestorLcl.pas
+1,582 −1,154		Source/VirtualTrees.BaseTree.pas
+32 −11		Source/VirtualTrees.Classes.pas
+115 −103		Source/VirtualTrees.ClipBoard.pas
+78 −11		Source/VirtualTrees.Colors.pas
+502 −66		Source/VirtualTrees.DataObject.pas
+114 −161		Source/VirtualTrees.DragImage.pas
+308 −38		Source/VirtualTrees.DragnDrop.pas
+23 −8		Source/VirtualTrees.DrawTree.pas
+68 −73		Source/VirtualTrees.EditLink.pas
+14 −14		Source/VirtualTrees.Export.pas
+1,224 −1,080		Source/VirtualTrees.Header.pas
+5 −6		Source/VirtualTrees.HeaderPopup.pas
+375 −315		Source/VirtualTrees.Types.pas
+453 −173		Source/VirtualTrees.Utils.pas
+11 −4		Source/VirtualTrees.WorkerThread.pas
+203 −103		Source/VirtualTrees.pas
+0 −2		Source/include/intf/carbon/olemethods.inc
+2 −2		Source/include/intf/carbon/vtgraphicsi.inc
+0 −2		Source/include/intf/carbon/vtvdragmanager.inc
+0 −2		Source/include/intf/carbon/vtvdragndrop.inc
+0 −2		Source/include/intf/cocoa/olemethods.inc
+2 −2		Source/include/intf/cocoa/vtgraphicsi.inc
+0 −2		Source/include/intf/cocoa/vtvdragmanager.inc
+0 −2		Source/include/intf/cocoa/vtvdragndrop.inc
+0 −499		Source/include/intf/dummydragmanager.inc
+0 −294		Source/include/intf/dummydragndrop.inc
+0 −289		Source/include/intf/dummyolemethods.inc
+0 −2		Source/include/intf/gtk/olemethods.inc
+1 −1		Source/include/intf/gtk/vtgraphicsi.inc
+0 −2		Source/include/intf/gtk/vtvdragmanager.inc
+0 −2		Source/include/intf/gtk/vtvdragndrop.inc
+0 −2		Source/include/intf/gtk2/olemethods.inc
+1 −1		Source/include/intf/gtk2/vtgraphicsi.inc
+0 −2		Source/include/intf/gtk2/vtvdragmanager.inc
+0 −2		Source/include/intf/gtk2/vtvdragndrop.inc
+0 −2		Source/include/intf/gtk3/olemethods.inc
+1 −1		Source/include/intf/gtk3/vtgraphicsi.inc
+0 −2		Source/include/intf/gtk3/vtvdragmanager.inc
+0 −2		Source/include/intf/gtk3/vtvdragndrop.inc
+0 −2		Source/include/intf/qt/olemethods.inc
+51 −3		Source/include/intf/qt/vtgraphicsi.inc
+0 −2		Source/include/intf/qt/vtvdragmanager.inc
+0 −2		Source/include/intf/qt/vtvdragndrop.inc
+0 −2		Source/include/intf/qt5/olemethods.inc
+30 −8		Source/include/intf/qt5/vtgraphicsi.inc
+0 −2		Source/include/intf/qt5/vtvdragmanager.inc
+0 −2		Source/include/intf/qt5/vtvdragndrop.inc
+0 −2		Source/include/intf/qt6/olemethods.inc
+1 −1		Source/include/intf/qt6/vtgraphicsi.inc
+0 −2		Source/include/intf/qt6/vtvdragmanager.inc
+0 −2		Source/include/intf/qt6/vtvdragndrop.inc
+0 −8		Source/include/intf/win32/olemethods.inc
+1 −1		Source/include/intf/win32/vtgraphicsi.inc
+0 −458		Source/include/intf/win32/vtvdragmanager.inc
+0 −272		Source/include/intf/win32/vtvdragndrop.inc
+0 −3		Source/units/carbon/fakeactivex.pas
+0 −3		Source/units/cocoa/fakeactivex.pas
+0 −425		Source/units/dummyactivex.inc
+22 −17		Source/units/dummyvirtualdragmanager.inc
+6 −6		Source/units/dummyvirtualpanningwindow.inc
+0 −3		Source/units/gtk/fakeactivex.pas
+0 −3		Source/units/gtk2/fakeactivex.pas
+0 −3		Source/units/gtk3/fakeactivex.pas
+0 −3		Source/units/qt/fakeactivex.pas
+0 −3		Source/units/qt5/fakeactivex.pas
+0 −3		Source/units/qt6/fakeactivex.pas
+15 −12		Source/units/win32/virtualdragmanager.pas
+2 −2		Source/units/win32/virtualpanningwindow.pas