Update CompileAll.bat

MagicFoundation · Sep 20, 2023 · 22c938a · 22c938a
1 parent a21bdf0
commit 22c938a
Show file tree

Hide file tree

Showing 18 changed files with 262 additions and 1,150 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,14 +24,10 @@ Dcu
 /Demos/**/OSXARM64/Release
 /Demos/**/Win32/Release
 /Demos/**/Win64/Release
-/Embarcadero/Rio/10_3_3/fmx
-/Embarcadero/Rio/10_3_3/rtl
-/Embarcadero/Sydney/10_4_2/rtl
-/Embarcadero/Sydney/10_4_2/fmx
-/Embarcadero/Alexandria/11_2/rtl
-/Embarcadero/Alexandria/11_2/fmx
-/Embarcadero/Alexandria/11_3/rtl
-/Embarcadero/Alexandria/11_3/fmx
+/Embarcadero/Alexandria/rtl
+/Embarcadero/Alexandria/fmx
+/Embarcadero/Alexandria/rtl
+/Embarcadero/Alexandria/fmx
 /Libraries/bpl
 /Libraries/ios/firebase
 /Libraries/ios/facebook

diff --git a/CompileAll.bat b/CompileAll.bat
@@ -54,14 +54,44 @@ REM --------------
 if not exist "%ALBaseDir%\Source\Alcinoe.inc" goto ERROR
 
 
+REM --------------------------------------------
+REM Copy and patch localy the delphi source code
+REM --------------------------------------------
+
+:COPY_AND_PATCH_DELPHI_SOURCE
+
+echo ------------------
+echo Delphi source code
+echo ------------------
+echo.
+
+set ALCopyAndPatchDelphiSource=
+set /P ALCopyAndPatchDelphiSource=Copy the Delphi source code and patch it locally (Y/N, default=Y)?: %=%
+more < nul > nul & REM This instruction to clear the ERRORLEVEL because previous instruction set ERRORLEVEL to 1 if empty input
+echo.
+
+if "%ALCopyAndPatchDelphiSource%"=="" set ALCopyAndPatchDelphiSource=Y
+if "%ALCopyAndPatchDelphiSource%"=="y" set ALCopyAndPatchDelphiSource=Y
+if "%ALCopyAndPatchDelphiSource%"=="n" set ALCopyAndPatchDelphiSource=N
+if "%ALCopyAndPatchDelphiSource%"=="Y" goto DO_COPY_AND_PATCH_DELPHI_SOURCE
+if "%ALCopyAndPatchDelphiSource%"=="N" goto DOWNLOAD_LIBRARIES
+goto COPY_AND_PATCH_DELPHI_SOURCE
+
+:DO_COPY_AND_PATCH_DELPHI_SOURCE
+
+call %ALBaseDir%\Embarcadero\%ALDelphiName%\Update.bat
+IF ERRORLEVEL 1 goto ERROR
+echo.
+
+
 REM ----------------------
 REM Download the libraries
 REM ----------------------
 
 :DOWNLOAD_LIBRARIES
 
 echo ---------
-echo LIBRARIES
+echo Libraries
 echo ---------
 echo.
 

diff --git a/Demos/ALAnimation/_Source/ALAnimationDemo.dproj b/Demos/ALAnimation/_Source/ALAnimationDemo.dproj
@@ -146,7 +146,7 @@
     <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <SanitizedProjectName>ALAnimationDemo</SanitizedProjectName>
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\Embarcadero\Alexandria\11_3\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base_Android)&#39;!=&#39;&#39;">
     <DCC_UsePackage>DBXSqliteDriver;DBXInterBaseDriver;tethering;bindcompfmx;FmxTeeUI;fmx;FireDACDBXDriver;dbexpress;IndyCore;dsnap;DataSnapCommon;bindengine;DataSnapClient;bindcompdbx;IndyIPCommon;IndyIPServer;IndySystem;fmxFireDAC;ibmonitor;FMXTee;DbxCommonDriver;ibxpress;xmlrtl;DataSnapNativeClient;ibxbindings;rtl;FireDACDSDriver;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)</DCC_UsePackage>

diff --git a/Demos/ALFacebookLogin/_Source/ALFacebookLogin.dproj b/Demos/ALFacebookLogin/_Source/ALFacebookLogin.dproj
@@ -160,7 +160,7 @@
     <Base>true</Base>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base)&#39;!=&#39;&#39;">
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\Embarcadero\Alexandria\11_3\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <DCC_CodePage>65001</DCC_CodePage>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <AUP_ACCESS_COARSE_LOCATION>true</AUP_ACCESS_COARSE_LOCATION>

diff --git a/Demos/ALFmxControls/_Source/ALFmxControls.dproj b/Demos/ALFmxControls/_Source/ALFmxControls.dproj
@@ -160,7 +160,7 @@
     <Base>true</Base>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base)&#39;!=&#39;&#39;">
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\Embarcadero\Alexandria\11_3\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <AUP_WRITE_EXTERNAL_STORAGE>true</AUP_WRITE_EXTERNAL_STORAGE>
     <AUP_CALL_PHONE>true</AUP_CALL_PHONE>

diff --git a/Demos/ALFmxFilterEffects/_Source/ALFmxFilterEffectsDemo.dproj b/Demos/ALFmxFilterEffects/_Source/ALFmxFilterEffectsDemo.dproj
@@ -146,7 +146,7 @@
     <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <SanitizedProjectName>ALFmxFilterEffectsDemo</SanitizedProjectName>
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\Embarcadero\Alexandria\11_3\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base_Android)&#39;!=&#39;&#39;">
     <DCC_UsePackage>DBXSqliteDriver;DBXInterBaseDriver;tethering;bindcompfmx;FmxTeeUI;fmx;FireDACDBXDriver;dbexpress;IndyCore;dsnap;DataSnapCommon;bindengine;DataSnapClient;bindcompdbx;IndyIPCommon;IndyIPServer;IndySystem;fmxFireDAC;ibmonitor;FMXTee;DbxCommonDriver;ibxpress;xmlrtl;DataSnapNativeClient;ibxbindings;rtl;FireDACDSDriver;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)</DCC_UsePackage>

diff --git a/Demos/ALGeoPositionSensor/_Source/ALGeoPositionSensorDemo.dproj b/Demos/ALGeoPositionSensor/_Source/ALGeoPositionSensorDemo.dproj
@@ -160,7 +160,7 @@
     <Base>true</Base>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base)&#39;!=&#39;&#39;">
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\Embarcadero\Alexandria\11_3\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <DCC_CodePage>65001</DCC_CodePage>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <AUP_ACCESS_COARSE_LOCATION>true</AUP_ACCESS_COARSE_LOCATION>

diff --git a/Demos/ALLiveVideoChat/Client/_Source/ALLiveVideoChatClient.dproj b/Demos/ALLiveVideoChat/Client/_Source/ALLiveVideoChatClient.dproj
@@ -182,7 +182,7 @@
     <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <SanitizedProjectName>ALLiveVideoChatClient</SanitizedProjectName>
-    <DCC_UnitSearchPath>..\..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\..\Embarcadero\Alexandria\11_3\rtl\android;..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\..\Embarcadero\Alexandria\fmx;..\..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\..\Embarcadero\Alexandria\rtl\android;..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <OrientationPortrait>true</OrientationPortrait>
     <OrientationPortraitUpsideDown>true</OrientationPortraitUpsideDown>
     <DCC_CodePage>65001</DCC_CodePage>

diff --git a/Demos/ALNotificationService/_Source/ALNotificationServiceDemo.dproj b/Demos/ALNotificationService/_Source/ALNotificationServiceDemo.dproj
@@ -182,7 +182,7 @@
     <DCC_S>false</DCC_S>
     <DCC_F>false</DCC_F>
     <DCC_K>false</DCC_K>
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\11_3\fmx;..\..\..\Embarcadero\Alexandria\11_3\rtl\ios;..\..\..\Embarcadero\Alexandria\11_3\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base_Android)&#39;!=&#39;&#39;">
     <IncludeAndroid_Splash>False</IncludeAndroid_Splash>