27 Feb 2025: version 1.1.0

- Added support to build design-time 64bit Packages for Delphi 12.3
- Added support for Delphi 12.3

Author: Carlo Barazzetta

README.md

@@ -1,13 +1,13 @@
-# InnoSetup Builder Scripts for Embarcadero RAD Studio<sup>©</sup>
+# InnoSetup Scripts for Embarcadero RAD Studio<sup>©</sup> Components Installer
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 ## A collection of InnoSetup Scripts to build a RAD Studio Setup for Delphi Packages of Components and Libraries of any types.
 
-### Actual official version 1.0.0
+### Actual official version 1.1.0
 
 Copyright <sup>©</sup> 2024-2025 Ethea S.r.l.
-Original Code is Copyright <sup>©</sup> 2021-2024 Skia4Delphi Project.
+Original Code is Copyright <sup>©</sup> 2021-2025 Skia4Delphi Project.
 Use of this source code is governed by the MIT license.
 
 ## Scope of this Scripts collection
@@ -105,7 +105,7 @@ This is an example of the "Build Groups Panel":
 
 Check in your .dproj xml file, if contains the correct "ProjectVersion" number, because the scripts use it to known the correct Delphi Version.
 
-for Example, for Delphi 12.2 ProjectVersion must be 20.2:
+for Example, for Delphi 12.3 ProjectVersion must be 20.3:
 
 ```xml
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@@ -129,7 +129,7 @@ Use this table for the correct "ProjectVersion" of every Delphi versions:
 | RAD Studio 10.3 Rio      | 18.5               | 18.8               | 260            |
 | RAD Studio 10.4 Sydney   | 19.0               | 19.2               | 270 or $(Auto) |
 | RAD Studio 11 Alexandria | 19.3               | 19.5               | 280 or $(Auto) |
-| RAD Studio 12 Athens     | 20.1               | 20.2               | 290 or $(Auto) |
+| RAD Studio 12 Athens     | 20.1               | 20.3               | 290 or $(Auto) |
 
 \*In case of conflict the script searches for Package Version\*\* (LibSuffix), so it is recommended to use "standard" Lib Suffix values.
 
@@ -163,5 +163,13 @@ After the installation check your Evironment Variable in Delphi IDE and Search P
 
   License [MIT-License](https://github.com/skia4delphi/skia4delphi?tab=MIT-1-ov-file)
 
+### RELEASE NOTES
+27 Feb 2025: version 1.1.0
+- Added support to build design-time 64bit Packages for Delphi 12.3
+- Added support for Delphi 12.3
 
+2 Jan 2025: version 1.0.0
+- Added support for bpl packages built in RAD Studio Common Bpl Folders
+- Added various Styles form customization of Setup
+- Added Italian language translation
 

Scripts/Setup.Preprocessor.ClearFiles.bat

@@ -1,7 +1,7 @@
 @echo off
 
 rem #
-rem # Copyright (c) 2024 (Ethea S.r.l.)
+rem # Copyright (c) 2024-2025 (Ethea S.r.l.)
 rem #
 rem # Original code is Copyright (c) 2021-2024 Skia4Delphi Project.
 rem #

Source/IO.Utils.inc

@@ -6,9 +6,9 @@
 {                                                                        }
 { InnoSetup Tools Library for Delphi Components                          }
 {                                                                        }
-{ Copyright (c) 2024 Ethea S.r.l.                                        }
+{ Copyright (c) 2024-2025 Ethea S.r.l.                                   }
 {                                                                        }
-{ Original Code is Copyright (c) 2021-2024 Skia4Delphi Project.          }
+{ Original Code is Copyright (c) 2021-2025 Skia4Delphi Project.          }
 {                                                                        }
 { Use of this source code is governed by the MIT license that can be     }
 { found in the LICENSE file.                                             }

Source/RADStudio.Build.inc

@@ -6,9 +6,9 @@
 {                                                                        }
 { InnoSetup Tools Library for Delphi Components                          }
 {                                                                        }
-{ Copyright (c) 2024 Ethea S.r.l.                                        }
+{ Copyright (c) 2024-2025 Ethea S.r.l.                                   }
 {                                                                        }
-{ Original Code is Copyright (c) 2021-2024 Skia4Delphi Project.          }
+{ Original Code is Copyright (c) 2021-2025 Skia4Delphi Project.          }
 {                                                                        }
 { Use of this source code is governed by the MIT license that can be     }
 { found in the LICENSE file.                                             }
@@ -23,15 +23,15 @@
   #include ".\RADStudio.Project.inc"
 
 type
-  TBeforeProjectBuildProc = procedure(const AProject: TRADStudioProject; const APlatform: TProjectPlatform; const AInfo: TRADStudioInfo);
+  TBeforeProjectBuildFunc = function(const AProject: TRADStudioProject; const APlatform: TProjectPlatform; const AInfo: TRADStudioInfo): Boolean;
   TTryExtractPreBuildObjectsProc = function(const AInfo: TRADStudioInfo): Boolean;
 
 /// <summary> Get platforms that are allowed to build in specific platform. Current, allowed only windows platforms to avoid problems with sdk. </summary>
 function GetPlatformsAllowedToBuild(const ARADStudioInfo: TRADStudioInfo): TProjectPlatforms; forward;
 /// <summary> Get steps of TryBuildRADStudioPackages used in WizardForm.ProgressGauge.Position. Use this to set WizardForm.ProgressGauge.Max before call the TryBuildRADStudioPackages. </summary>
 function GetTryBuildRADStudioPackagesSteps(const ARADStudioInfos: TRADStudioInfos; const AGroupProjects: TRADStudioGroupProjects): Integer; forward;
 /// <summary> Try to build RAD Studio packages, but only in allowed platforms. </summary>
-function TryBuildRADStudioPackages(const ARADStudioInfos: TRADStudioInfos; const AGroupProjects: TRADStudioGroupProjects; const ACustomParameter: string; const ABeforeProjectBuild: TBeforeProjectBuildProc; const ATryExtractPreBuildObjects: TTryExtractPreBuildObjectsProc): Boolean; forward;
+function TryBuildRADStudioPackages(const ARADStudioInfos: TRADStudioInfos; const AGroupProjects: TRADStudioGroupProjects; const ACustomParameter: string; const ABeforeProjectBuild: TBeforeProjectBuildFunc; const ATryExtractPreBuildObjects: TTryExtractPreBuildObjectsProc): Boolean; forward;
 
 // implementation
 
@@ -45,7 +45,7 @@ const
 /// <summary> Get the MSBuild parameters. The custom parameter is optionally. </summary>
 function _GetMSBuildParams(const AConfig: TProjectConfig; const APlatform: TProjectPlatform; const ACustomParameter: string): string; forward;
 /// <summary> Try to get the comand to build a project. The custom parameter is optionally. </summary>
-function _TryBuildRADStudioProject(const ARADStudioInfo: TRADStudioInfo; const AConfig: TProjectConfig; const APlatform: TProjectPlatform; const AProject: TRADStudioProject; const ACustomParameter, ALogFileName: string; const ABeforeProjectBuild: TBeforeProjectBuildProc; out AResultCode: Integer): Boolean; forward;
+function _TryBuildRADStudioProject(const ARADStudioInfo: TRADStudioInfo; const AConfig: TProjectConfig; const APlatform: TProjectPlatform; const AProject: TRADStudioProject; const ACustomParameter, ALogFileName: string; const ABeforeProjectBuild: TBeforeProjectBuildFunc; out AResultCode: Integer): Boolean; forward;
 /// <summary> Try to get the comand to build a project. The custom parameter is optionally. </summary>
 function _TryGetBuildCommand(const ARADStudioInfo: TRADStudioInfo; const AConfig: TProjectConfig; const APlatform: TProjectPlatform; const AProjectFileName, ACustomParameter, ALogFileName: string; out ACommand: string): Boolean; forward;
 
@@ -93,7 +93,7 @@ begin
 end;
 
 function TryBuildRADStudioPackages(const ARADStudioInfos: TRADStudioInfos; const AGroupProjects: TRADStudioGroupProjects; const ACustomParameter: string;
-  const ABeforeProjectBuild: TBeforeProjectBuildProc; const ATryExtractPreBuildObjects: TTryExtractPreBuildObjectsProc): Boolean;
+  const ABeforeProjectBuild: TBeforeProjectBuildFunc; const ATryExtractPreBuildObjects: TTryExtractPreBuildObjectsProc): Boolean;
 var
   I, J, K: Integer;
   LInfo: TRADStudioInfo;
@@ -153,25 +153,39 @@ begin
 end;
 
 function _TryBuildRADStudioProject(const ARADStudioInfo: TRADStudioInfo; const AConfig: TProjectConfig; const APlatform: TProjectPlatform;
-  const AProject: TRADStudioProject; const ACustomParameter, ALogFileName: string; const ABeforeProjectBuild: TBeforeProjectBuildProc; out AResultCode: Integer): Boolean;
+  const AProject: TRADStudioProject; const ACustomParameter, ALogFileName: string; const ABeforeProjectBuild: TBeforeProjectBuildFunc; out AResultCode: Integer): Boolean;
 var
-  LProjectDir: string;
+  LProjectDir, LVersion: string;
   LCommand: string;
+  LBuild: Boolean;
 begin
   DeleteFile(ALogFileName);
   Result := _TryGetBuildCommand(ARADStudioInfo, AConfig, APlatform, AProject.FileName, ACustomParameter, ALogFileName, LCommand);
   if Result then
   begin
     AResultCode := 0;
     LProjectDir := ExtractFilePath(AProject.FileName);
+    LBuild := True;
     if ABeforeProjectBuild <> nil then
-      ABeforeProjectBuild(AProject, APlatform, ARADStudioInfo);
-    Result := Exec(ExpandConstant('{cmd}'), '/C ' + LCommand, LProjectDir, SW_HIDE, ewWaitUntilTerminated, AResultCode) and (AResultCode = 0);
-  end;
-  if Result then
-    DeleteFile(ALogFileName)
-  else
-    Log(Format('RADStudio.Build._TryBuildRADStudioProject: Failed executing command "%s"', [LCommand]));
+      LBuild := ABeforeProjectBuild(AProject, APlatform, ARADStudioInfo);
+    if LBuild then  
+    begin
+      Result := Exec(ExpandConstant('{cmd}'), '/C ' + LCommand, LProjectDir, SW_HIDE, ewWaitUntilTerminated, AResultCode) and (AResultCode = 0)
+      if Result then
+        DeleteFile(ALogFileName)
+      else
+      begin
+        LVersion := ARADStudioInfo.Version.RegVersion;
+        //Check if we are building a 64Bit Design-Time Package: do not stop process, for backward compatibility with Delphi 12.2
+        if (APlatform = pfWin64) and AProject.IsDesignOnly and (LVersion = '23.0') then
+          Result := True
+        else  
+          Log(Format('RADStudio.Build._TryBuildRADStudioProject: Failed executing command "%s"', [LCommand]));
+      end;  
+    end
+    else
+      Log(Format('RADStudio.Build._TryBuildRADStudioProject: Skipped Build of Package "%s"', [AProject.FileName]));
+  end;          
 end;
 
 function _TryGetBuildCommand(const ARADStudioInfo: TRADStudioInfo; const AConfig: TProjectConfig; const APlatform: TProjectPlatform; const AProjectFileName, ACustomParameter, ALogFileName: string; out ACommand: string): Boolean;

Source/RADStudio.Project.inc

@@ -6,9 +6,9 @@
 {                                                                        }
 { InnoSetup Tools Library for Delphi Components                          }
 {                                                                        }
-{ Copyright (c) 2024 Ethea S.r.l.                                        }
+{ Copyright (c) 2024-2025 Ethea S.r.l.                                   }
 {                                                                        }
-{ Original Code is Copyright (c) 2021-2024 Skia4Delphi Project.          }
+{ Original Code is Copyright (c) 2021-2025 Skia4Delphi Project.          }
 {                                                                        }
 { Use of this source code is governed by the MIT license that can be     }
 { found in the LICENSE file.                                             }

Source/RADStudio.inc

@@ -6,9 +6,9 @@
 {                                                                        }
 { InnoSetup Tools Library for Delphi Components                          }
 {                                                                        }
-{ Copyright (c) 2024 Ethea S.r.l.                                        }
+{ Copyright (c) 2024-2025 Ethea S.r.l.                                   }
 {                                                                        }
-{ Original Code is Copyright (c) 2021-2024 Skia4Delphi Project.          }
+{ Original Code is Copyright (c) 2021-2025 Skia4Delphi Project.          }
 {                                                                        }
 { Use of this source code is governed by the MIT license that can be     }
 { found in the LICENSE file.                                             }
@@ -95,8 +95,10 @@ function TryGetRADStudioRSVarsBatchFileName(const ARADStudioInfo: TRADStudioInfo
 function TryGetRADStudioVersionByRegVersion(const ARegVersion: string; out ARADStudioVersion: TRADStudioVersion): Boolean; forward;
 /// <summary> Try to get the RAD Studio version of a project </summary>
 function TryGetRADStudioVersionOfProject(const AProject: TRADStudioProject; out ARADStudioVersion: TRADStudioVersion): Boolean; forward;
+/// <summary> Calculate Registry Node Name for KnownPackages</summary>
+function GetKnownPackagesNodeName(const APlatform: TProjectPlatform): string; forward;
 /// <summary> Try to register a Bpl in RAD Studio </summary>
-function TryRegisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const ABplFileName, ADescription: string): Boolean; forward;
+function TryRegisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const APlatform: TProjectPlatform; const ABplFileName, ADescription: string): Boolean; forward;
 /// <summary> Try to remove a library instaled using the GetIt </summary>
 function TryRemoveFromGetIt(const AInfos: TRADStudioInfos; const ALibraryName: string): Boolean; forward;
 /// <summary> Try to remove an environment variable exclusive of RAD Studio application </summary>
@@ -110,7 +112,7 @@ function TryRemoveRADStudioLibrarySearchPath(const ARADStudioVersion: TRADStudio
 /// <summary> Try to remove a path to the PATH environment variable exclusive of RAD Studio application </summary>
 function TryRemoveRADStudioPathEnvVariable(const ARADStudioVersion: TRADStudioVersion; const APath: string): Boolean; forward;
 /// <summary> Try to unregister a Bpl in RAD Studio </summary>
-function TryUnregisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const ABplFileName: string): Boolean; forward;
+function TryUnregisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const APlatform: TProjectPlatform; const ABplFileName: string): Boolean; forward;
 
 // implementation
 
@@ -496,7 +498,7 @@ begin
   _FRADStudioVersions[GetArrayLength(_FRADStudioVersions) - 1] := LRADStudioVersion;
 
   // RAD Studio 10.0 Seattle
-  LRADStudioVersion.Name := 'RAD Studio 10.0 Seattle';
+  LRADStudioVersion.Name := 'RAD Studio 10 Seattle';
   LRADStudioVersion.RegVersion := '17.0';
   LRADStudioVersion.SupportedPlatformsDelphi := [pfWin32, pfWin64, pfAndroid, pfiOSDevice32, pfiOSDevice64, pfiOSSimulator, pfOSX32];
   LRADStudioVersion.SupportedPlatforms := LRADStudioVersion.SupportedPlatformsDelphi;
@@ -602,7 +604,7 @@ begin
   LRADStudioVersion.RegVersion := '23.0';
   LRADStudioVersion.SupportedPlatformsDelphi := [pfWin32, pfWin64, pfAndroid, pfAndroid64, pfiOSDevice64, pfiOSSimARM64, pfiOSSimulator, pfOSX64, pfOSXARM64, pfLinux64];
   LRADStudioVersion.SupportedPlatforms := LRADStudioVersion.SupportedPlatformsDelphi;
-  LRADStudioVersion.MaxDprojVersion := '20.2';
+  LRADStudioVersion.MaxDprojVersion := '20.3';
   LRADStudioVersion.MinDprojVersion := '20.1';
   LRADStudioVersion.PackageVersion := '290';
   LRADStudioVersion.OldLibSuffix := 'D12';  
@@ -951,10 +953,21 @@ begin
     Log(Format('RADStudio.TryGetRADStudioVersionOfProject: Failed to get the RAD Studio version of the project "%s" with project version "%s".', [AProject.FileName, AProject.ProjectVersion]));
 end;
 
-function TryRegisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const ABplFileName, ADescription: string): Boolean;
+function GetKnownPackagesNodeName(const APlatform: TProjectPlatform): String;
 begin
-  Result := TryUnregisterRADStudioBpl(ARADStudioVersion, ABplFileName) and
-    RegWriteStringValue(HKEY_CURRENT_USER, GetRADStudioRegKey(ARADStudioVersion) + '\Known Packages', ABplFileName, ADescription);
+  if APlatform = pfWin64 then
+    Result := '\Known Packages x64'
+  else 
+    Result := '\Known Packages';
+end;
+
+function TryRegisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const APlatform: TProjectPlatform; const ABplFileName, ADescription: string): Boolean;
+var
+  LNode: string;
+begin
+  LNode := GetKnownPackagesNodeName(APlatform);
+  Result := TryUnregisterRADStudioBpl(ARADStudioVersion, APlatform, ABplFileName) and
+    RegWriteStringValue(HKEY_CURRENT_USER, GetRADStudioRegKey(ARADStudioVersion) + LNode, ABplFileName, ADescription);
   if not Result then
     Log(Format('RADStudio.TryRegisterRADStudioBpl: Failed to register the RAD Studio bpl "%s".', [ABplFileName]));
 end;
@@ -1111,30 +1124,33 @@ begin
   end;
 end;
 
-function TryUnregisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const ABplFileName: string): Boolean;
+function TryUnregisterRADStudioBpl(const ARADStudioVersion: TRADStudioVersion; const APlatform: TProjectPlatform; const ABplFileName: string): Boolean;
 var
   LRegisteredBpls: TArrayOfString;
   LBplName: string;
   I: Integer;
+var
+  LNode: string;
 begin
-  Result := RegGetValueNames(HKEY_CURRENT_USER, GetRADStudioRegKey(ARADStudioVersion) + '\Known Packages', LRegisteredBpls);
+  LNode := GetKnownPackagesNodeName(APlatform);
+  Result := RegGetValueNames(HKEY_CURRENT_USER, GetRADStudioRegKey(ARADStudioVersion) + LNode, LRegisteredBpls);
   if Result then
   begin
     LBplName := ExtractFileName(ABplFileName);
     for I := 0 to GetArrayLength(LRegisteredBpls) - 1 do
     begin
       if SameText(LBplName, ExtractFileName(LRegisteredBpls[I])) then
       begin
-        if not RegDeleteValue(HKEY_CURRENT_USER, GetRADStudioRegKey(ARADStudioVersion) + '\Known Packages', LRegisteredBpls[I]) then
+        if not RegDeleteValue(HKEY_CURRENT_USER, GetRADStudioRegKey(ARADStudioVersion) + LNode, LRegisteredBpls[I]) then
         begin
           Result := False;
-          Log(Format('RADStudio.TryUnregisterRADStudioBpl: Failed to unregister the bpl "%s". Cannot possible to delete the value "%s" from registry "%s"', [ABplFileName, LRegisteredBpls[I], 'HKEY_CURRENT_USER' + GetRADStudioRegKey(ARADStudioVersion) + '\Known Packages']));
+          Log(Format('RADStudio.TryUnregisterRADStudioBpl: Failed to unregister the bpl "%s". Cannot delete the value "%s" from registry "%s"', [ABplFileName, LRegisteredBpls[I], 'HKEY_CURRENT_USER' + GetRADStudioRegKey(ARADStudioVersion) + LNode]));
         end;
       end;  
     end;
   end
   else
-    Log(Format('RADStudio.TryUnregisterRADStudioBpl: Failed to unregister the bpl "%s". Cannot possible to get the list of Known Packages from registry "%s"', [ABplFileName, 'HKEY_CURRENT_USER' + GetRADStudioRegKey(ARADStudioVersion) + '\Known Packages']));
+    Log(Format('RADStudio.TryUnregisterRADStudioBpl: Failed to unregister the bpl "%s". Cannot possible to get the list of Known Packages from registry "%s"', [ABplFileName, 'HKEY_CURRENT_USER' + GetRADStudioRegKey(ARADStudioVersion) + LNode]));
   Result := _TryRemoveRADStudioBplFromDisabledPackages(ARADStudioVersion, ABplFileName) and Result;
 end;