From a447ac23df7d434f3ae2838b633bcfb1e9f5c526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= <briskbard@briskbard.com> Date: Sat, 14 Sep 2024 15:25:00 +0200 Subject: [PATCH] Added Delphi 12.2 mention --- README.md | 2 +- packages/CEF4DelphiFMXRTL.dproj | 20 ++------------------ packages/CEF4DelphiVCLRTL.dproj | 27 +++------------------------ packages/CEF4Delphi_designtime.dproj | 20 ++------------------ source/cef.inc | 4 ++-- update_CEF4Delphi.json | 2 +- 6 files changed, 11 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index d18abc39..ff4bae0d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The CEF binaries used by CEF4Delphi are available for download at Spotify : * [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_128.4.9%2Bg9840ad9%2Bchromium-128.0.6613.120_linuxarm64.tar.bz2) * [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_128.4.9%2Bg9840ad9%2Bchromium-128.0.6613.120_macosx64.tar.bz2) -CEF4Delphi was developed and tested on Delphi 12.1 and it has been tested in Delphi 6, Delphi XE, Delphi 10, Delphi 11 and Lazarus 3.4/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. +CEF4Delphi was developed and tested on Delphi 12.2 and it has been tested in Delphi 6, Delphi XE, Delphi 10, Delphi 11 and Lazarus 3.4/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. CEF4Delphi demos have been tested in Windows 10, Windows 11, Linux Mint 22 and Raspberry Pi OS. diff --git a/packages/CEF4DelphiFMXRTL.dproj b/packages/CEF4DelphiFMXRTL.dproj index a804beec..fccba0e6 100644 --- a/packages/CEF4DelphiFMXRTL.dproj +++ b/packages/CEF4DelphiFMXRTL.dproj @@ -2,7 +2,7 @@ <PropertyGroup> <ProjectGuid>{6111BE8D-A9BC-437E-B3BF-D2BB9C393BAC}</ProjectGuid> <MainSource>CEF4DelphiFMXRTL.dpk</MainSource> - <ProjectVersion>20.1</ProjectVersion> + <ProjectVersion>20.2</ProjectVersion> <FrameworkType>FMX</FrameworkType> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> @@ -207,7 +207,7 @@ <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> </Excluded_Packages> </Delphi.Personality> - <Deployment Version="4"> + <Deployment Version="5"> <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule"> <Platform Name="iOSSimulator"> <Overwrite>true</Overwrite> @@ -234,16 +234,6 @@ <Operation>0</Operation> </Platform> </DeployClass> - <DeployClass Name="AndroidClasses"> - <Platform Name="Android"> - <RemoteDir>classes</RemoteDir> - <Operation>64</Operation> - </Platform> - <Platform Name="Android64"> - <RemoteDir>classes</RemoteDir> - <Operation>64</Operation> - </Platform> - </DeployClass> <DeployClass Name="AndroidFileProvider"> <Platform Name="Android"> <RemoteDir>res\xml</RemoteDir> @@ -254,12 +244,6 @@ <Operation>1</Operation> </Platform> </DeployClass> - <DeployClass Name="AndroidGDBServer"> - <Platform Name="Android"> - <RemoteDir>library\lib\armeabi-v7a</RemoteDir> - <Operation>1</Operation> - </Platform> - </DeployClass> <DeployClass Name="AndroidLibnativeArmeabiFile"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi</RemoteDir> diff --git a/packages/CEF4DelphiVCLRTL.dproj b/packages/CEF4DelphiVCLRTL.dproj index 874babf2..9a028ce3 100644 --- a/packages/CEF4DelphiVCLRTL.dproj +++ b/packages/CEF4DelphiVCLRTL.dproj @@ -2,7 +2,7 @@ <PropertyGroup> <ProjectGuid>{72BCECD8-EF22-4015-A019-1D4ADE0AC5F0}</ProjectGuid> <MainSource>CEF4DelphiVCLRTL.dpk</MainSource> - <ProjectVersion>20.1</ProjectVersion> + <ProjectVersion>20.2</ProjectVersion> <FrameworkType>VCL</FrameworkType> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> @@ -355,19 +355,14 @@ <Source Name="MainSource">CEF4DelphiVCLRTL.dpk</Source> </Source> </Delphi.Personality> - <Deployment Version="4"> + <Deployment Version="5"> <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule"/> <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule"/> <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule"/> <DeployFile LocalName="..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\22.0\Bpl\CEF4DelphiVCLRTL.bpl" Configuration="Debug" Class="ProjectOutput"/> <DeployFile LocalName="..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\22.0\Bpl\CEF4DelphiVCLRTL.bpl" Configuration="Release" Class="ProjectOutput"/> <DeployFile LocalName="..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\22.0\Bpl\Win64\CEF4DelphiVCLRTL.bpl" Configuration="Release" Class="ProjectOutput"/> - <DeployFile LocalName="..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\23.0\Bpl\CEF4DelphiVCLRTL.bpl" Configuration="Debug" Class="ProjectOutput"> - <Platform Name="Win32"> - <RemoteName>CEF4DelphiVCLRTL.bpl</RemoteName> - <Overwrite>true</Overwrite> - </Platform> - </DeployFile> + <DeployFile LocalName="..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\23.0\Bpl\CEF4DelphiVCLRTL.bpl" Configuration="Debug" Class="ProjectOutput"/> <DeployClass Name="AdditionalDebugSymbols"> <Platform Name="OSX32"> <Operation>1</Operation> @@ -376,16 +371,6 @@ <Operation>0</Operation> </Platform> </DeployClass> - <DeployClass Name="AndroidClasses"> - <Platform Name="Android"> - <RemoteDir>classes</RemoteDir> - <Operation>64</Operation> - </Platform> - <Platform Name="Android64"> - <RemoteDir>classes</RemoteDir> - <Operation>64</Operation> - </Platform> - </DeployClass> <DeployClass Name="AndroidFileProvider"> <Platform Name="Android"> <RemoteDir>res\xml</RemoteDir> @@ -396,12 +381,6 @@ <Operation>1</Operation> </Platform> </DeployClass> - <DeployClass Name="AndroidGDBServer"> - <Platform Name="Android"> - <RemoteDir>library\lib\armeabi-v7a</RemoteDir> - <Operation>1</Operation> - </Platform> - </DeployClass> <DeployClass Name="AndroidLibnativeArmeabiFile"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi</RemoteDir> diff --git a/packages/CEF4Delphi_designtime.dproj b/packages/CEF4Delphi_designtime.dproj index 595a5ce1..7cdf0863 100644 --- a/packages/CEF4Delphi_designtime.dproj +++ b/packages/CEF4Delphi_designtime.dproj @@ -2,7 +2,7 @@ <PropertyGroup> <ProjectGuid>{032D9C75-B050-4BDC-9BB3-25C299BA58D6}</ProjectGuid> <MainSource>CEF4Delphi_designtime.dpk</MainSource> - <ProjectVersion>20.1</ProjectVersion> + <ProjectVersion>20.2</ProjectVersion> <FrameworkType>None</FrameworkType> <Base>True</Base> <Config Condition="'$(Config)'==''">Debug</Config> @@ -182,7 +182,7 @@ <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> </Excluded_Packages> </Delphi.Personality> - <Deployment Version="4"> + <Deployment Version="5"> <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule"> <Platform Name="iOSSimulator"> <Overwrite>true</Overwrite> @@ -208,16 +208,6 @@ <Operation>0</Operation> </Platform> </DeployClass> - <DeployClass Name="AndroidClasses"> - <Platform Name="Android"> - <RemoteDir>classes</RemoteDir> - <Operation>64</Operation> - </Platform> - <Platform Name="Android64"> - <RemoteDir>classes</RemoteDir> - <Operation>64</Operation> - </Platform> - </DeployClass> <DeployClass Name="AndroidFileProvider"> <Platform Name="Android"> <RemoteDir>res\xml</RemoteDir> @@ -228,12 +218,6 @@ <Operation>1</Operation> </Platform> </DeployClass> - <DeployClass Name="AndroidGDBServer"> - <Platform Name="Android"> - <RemoteDir>library\lib\armeabi-v7a</RemoteDir> - <Operation>1</Operation> - </Platform> - </DeployClass> <DeployClass Name="AndroidLibnativeArmeabiFile"> <Platform Name="Android"> <RemoteDir>library\lib\armeabi</RemoteDir> diff --git a/source/cef.inc b/source/cef.inc index 276d2a78..1ebd84e3 100644 --- a/source/cef.inc +++ b/source/cef.inc @@ -1,5 +1,5 @@ // The complete list of compiler versions is here : - // http://docwiki.embarcadero.com/RADStudio/Tokyo/en/Compiler_Versions + // https://docwiki.embarcadero.com/RADStudio/Athens/en/Compiler_Versions {$DEFINE DELPHI_VERSION_UNKNOW} @@ -393,7 +393,7 @@ {$DEFINE DELPHI28_UP} {$ENDIF} -// Rad Studio 12.0 - Delphi Yukon +// Rad Studio 12.0 - Delphi Athens {$IFDEF VER360} {$UNDEF DELPHI_VERSION_UNKNOW} {$DEFINE DELPHI5_UP} diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 3da8cfe9..1bad718c 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 656, + "InternalVersion" : 657, "Name" : "cef4delphi_lazarus.lpk", "Version" : "128.4.9" }