diff --git a/References/BlankApplication/Project1.dpr b/References/BlankApplication/Project1.dpr index 27374b2b7..3bf58e0b8 100644 --- a/References/BlankApplication/Project1.dpr +++ b/References/BlankApplication/Project1.dpr @@ -3,11 +3,13 @@ program Project1; uses System.StartUpCopy, FMX.Forms, + FMX.Skia, Unit1 in 'Unit1.pas' {Form1}; {$R *.res} begin + GlobalUseSkia := True; Application.Initialize; Application.CreateForm(TForm1, Form1); Application.Run; diff --git a/References/BlankApplication/Project1.dproj.normalize.bat b/References/BlankApplication/Project1.dproj.normalize.bat index 3a5501dd7..ba1177931 100644 --- a/References/BlankApplication/Project1.dproj.normalize.bat +++ b/References/BlankApplication/Project1.dproj.normalize.bat @@ -1,3 +1,5 @@ @echo off -call "%~dp0\..\..\Tools\DProjNormalizer\DProjNormalizer.exe" -DProj="%~dp0\Project1.dproj" -CreateBackup="false" \ No newline at end of file +del "%~dp0\Project1.dproj.bak" /s + +call "%~dp0\..\..\Tools\DProjNormalizer\DProjNormalizer.exe" -DProj="%~dp0\Project1.dproj" -CreateBackup="true" \ No newline at end of file diff --git a/References/BlankApplication/README.md b/References/BlankApplication/README.md index 065f28401..be17d57d9 100644 --- a/References/BlankApplication/README.md +++ b/References/BlankApplication/README.md @@ -27,29 +27,10 @@ Check template files iOSSimARM64\Release\Project1.entitlements and report any found diffs in your project(s) * Commit only the previous template files - - -Check DProjNormalizer ---------------------- - -* Delete everything in this directory except - clean.bat - README.md - Project1.dproj.normalize.bat - Project1.deployproj.normalize.bat -* Make a new multi platform blank application (Name it Project1) -* Build each plateform in debug (ctrl+f9) -* Build each plateform in release (ctrl+f9) -* Deploy each plateform in debug (ctrl+alt+shif+f9) -* Deploy each plateform in release (ctrl+alt+shif+f9) -* Run clean.bat -* Run Project1.dproj.normalize.bat -* Study the diffs with previous commited version -* Commit -Check DeployProjNormalizer --------------------------- +Check DProjNormalizer/DeployProjNormalizer +------------------------------------------ * Delete everything in this directory except clean.bat @@ -77,13 +58,18 @@ Check DeployProjNormalizer BFD2217C-51A5-4855-BA03-B430731C177E * close Delphi -* save somewhere Project1.deployproj +* commit Project1.deployproj and Project1.deployproj.bak +* delete Project1.deployproj and Project1.deployproj.bak * Run Project1.dproj.normalize.bat +* Study the diffs between Project1.dproj and the previous commited version +* Study the diffs between Project1.dproj.bak and the previous commited version +* commit Project1.dproj and Project1.dproj.bak * Build each plateform in debug (ctrl+f9) * Build each plateform in release (ctrl+f9) * Deploy each plateform in debug (ctrl+alt+shif+f9) * Deploy each plateform in release (ctrl+alt+shif+f9) +* Close Delphi WITHOUT saving the project1 * run Project1.deployproj.normalize.bat and make a diff compare with - the new generated deployproj vs deployproj.bak. -* if you do not detect any difference then it's ok else you need - to update the source code of DeployProjNormalizer \ No newline at end of file + the new generated deployproj vs the commited deployproj +* Run clean.bat +* Commit \ No newline at end of file diff --git a/References/BlankApplication/clean.bat b/References/BlankApplication/clean.bat index be18f1b75..20fb94d41 100644 --- a/References/BlankApplication/clean.bat +++ b/References/BlankApplication/clean.bat @@ -14,4 +14,6 @@ del Project1.dSYM /s del Project1 /s del Project1.rsm /s del Project1.dproj.local /s -del Project1.identcache /s \ No newline at end of file +del Project1.identcache /s +del sk4d.dll /s +del libsk4d.so /s