From 66ead6dac76bc2abbf573fa6620c1f1a6a9ba5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Depin=C3=A9=20Dalpiaz?= Date: Sun, 3 May 2020 22:58:03 -0300 Subject: [PATCH] fixed public folder for Delphi XE5 or below --- CompInstall.dproj | 413 ++++++++++++++++++++++++++++++++++++++++++++-- README.md | 4 + UFrm.dfm | 2 +- UFrm.pas | 16 +- 4 files changed, 420 insertions(+), 15 deletions(-) diff --git a/CompInstall.dproj b/CompInstall.dproj index 6e0fb15..c7cfc06 100644 --- a/CompInstall.dproj +++ b/CompInstall.dproj @@ -1,7 +1,7 @@  {9FB451FF-56AD-4400-8229-E289EFFCD751} - 18.6 + 18.8 VCL CompInstall.dpr True @@ -18,11 +18,6 @@ Base true - - true - Base - true - true Base @@ -70,9 +65,6 @@ 1033 $(BDS)\bin\default_app.manifest - - DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;tethering;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;TeeDB;FireDAC;vcltouch;vcldb;bindcompfmx;FireDACSqliteDriver;FireDACPgDriver;inetdb;FMXTee;soaprtl;DbxCommonDriver;FmxTeeUI;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;Tee;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;TeeUI;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage) - DEBUG;$(DCC_Define) true @@ -164,12 +156,20 @@ classes 1 + + classes + 1 + res\xml 1 + + res\xml + 1 + @@ -182,96 +182,242 @@ library\lib\armeabi 1 + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + library\lib\mips 1 + + library\lib\mips + 1 + library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + res\drawable 1 + + res\drawable + 1 + res\values 1 + + res\values + 1 + res\values-v21 1 + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + res\drawable 1 + + res\drawable + 1 + res\drawable-xxhdpi 1 + + res\drawable-xxhdpi + 1 + res\drawable-ldpi 1 + + res\drawable-ldpi + 1 + res\drawable-mdpi 1 + + res\drawable-mdpi + 1 + res\drawable-hdpi 1 + + res\drawable-hdpi + 1 + res\drawable-xhdpi 1 + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + res\drawable-small 1 + + res\drawable-small + 1 + res\drawable-normal 1 + + res\drawable-normal + 1 + res\drawable-large 1 + + res\drawable-large + 1 + res\drawable-xlarge 1 + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + @@ -360,6 +506,9 @@ 0 + + 0 + 0 @@ -392,6 +541,17 @@ 1 + + + 1 + + + 1 + + + 1 + + 1 @@ -403,6 +563,39 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -414,6 +607,61 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -425,6 +673,116 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 @@ -458,10 +816,35 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + 1 + + 1 + @@ -554,6 +937,10 @@ library\lib\armeabi-v7a 1 + + library\lib\arm64-v8a + 1 + 1 @@ -578,6 +965,12 @@ 0 + + + library\lib\armeabi-v7a + 1 + + 1 @@ -615,10 +1008,10 @@ + True - False 12 diff --git a/README.md b/README.md index 4220094..47815d2 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ ## What's New +- 05/03/2020 (Version 1.2) + + - Fixed RegisterBPL method because Delphi XE5 or below use "RAD Studio" public folder instead "Embarcadero\Studio". + - 02/15/2019 (Version 1.1) - Removed Allow64bit parameter in the General section. The app will detect this parameter automatically when appears at any package parameter. diff --git a/UFrm.dfm b/UFrm.dfm index 68f887a..6d4aa46 100644 --- a/UFrm.dfm +++ b/UFrm.dfm @@ -44,7 +44,7 @@ object Frm: TFrm Top = 16 Width = 123 Height = 13 - Caption = 'Component Installer 1.1' + Caption = 'Component Installer 1.2' Font.Charset = ANSI_CHARSET Font.Color = clGreen Font.Height = -11 diff --git a/UFrm.pas b/UFrm.pas index 9e8be0c..cf167c6 100644 --- a/UFrm.pas +++ b/UFrm.pas @@ -184,8 +184,8 @@ procedure TFrm.LoadDelphiVersions; Add('9.0', 'XE2', 'Delphi XE2'); Add('10.0', 'XE3', 'Delphi XE3'); Add('11.0', 'XE4', 'Delphi XE4'); - Add('12.0', 'XE5', 'Delphi XE5'); - Add('14.0', 'XE6', 'Delphi XE6'); + Add('12.0', 'XE5', 'Delphi XE5'); //public folder 'RAD Studio' + Add('14.0', 'XE6', 'Delphi XE6'); //public folder 'Embarcadero\Studio' Add('15.0', 'XE7', 'Delphi XE7'); Add('16.0', 'XE8', 'Delphi XE8'); Add('17.0', '10', 'Delphi 10 Seattle'); @@ -380,11 +380,19 @@ function GetPublicDocs: String; procedure TFrm.RegisterBPL(const aPackage: String); var R: TRegistry; - BplDir: String; + BplDir, PublicPrefix: String; + FS: TFormatSettings; begin Log('Install BPL into IDE of '+aPackage); - BplDir := AddBarDir(GetPublicDocs)+'Embarcadero\Studio\'+InternalDelphiVersionKey+'\Bpl'; + FS := TFormatSettings.Create; + FS.DecimalSeparator := '.'; + if StrToFloat(InternalDelphiVersionKey, FS)<=12 then //Delphi XE5 or below + PublicPrefix := 'RAD Studio' + else + PublicPrefix := 'Embarcadero\Studio'; + + BplDir := AddBarDir(GetPublicDocs)+PublicPrefix+'\'+InternalDelphiVersionKey+'\Bpl'; if not DirectoryExists(BplDir) then raise Exception.CreateFmt('Public Delphi folder not found at: %s', [BplDir]);