Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New binary release 2.90 for Delphi 12 #24

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ modules/

# Newer Delphi Versions create the *.res files in the build script
*.res
*.zip
8 changes: 8 additions & 0 deletions Code/DDevExtensions/Bin/Changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Version: 2.90
=============
- Added: Support for Delphi 12.0

Version: 2.89
=============
- Fixed: Update NativeProgressForm Delphi 11.1 Alexandria

Version: 2.88
=============
- Added: Support for Delphi 11.0 Alexandria
Expand Down
2 changes: 1 addition & 1 deletion Code/DDevExtensions/Bin/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DDevExtensions
==============

(C) 2006-2021 Andreas Hausladen
(C) 2006-2022 Andreas Hausladen
[email protected]
https://www.idefixpack.de/ddev

Expand Down
2 changes: 1 addition & 1 deletion Code/DDevExtensions/Bin/Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DDevExtensions Version 2.88
DDevExtensions Version 2.90
14 changes: 13 additions & 1 deletion Code/DDevExtensions/D_D110/DDevExtensions.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>..\bin\DDevExtensionsD110.dll</DCC_DependencyCheckOutputName>
<ProjectVersion>19.3</ProjectVersion>
<ProjectVersion>19.4</ProjectVersion>
<Config Condition="'$(Config)'==''">Release</Config>
<Basis>True</Basis>
<AppType>Library</AppType>
Expand All @@ -27,6 +27,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
Expand Down Expand Up @@ -69,6 +75,7 @@
$(PreBuildEvent)]]></PreBuildEvent>
<Debugger_LoadAllSymbols>false</Debugger_LoadAllSymbols>
<Debugger_HostApplication>$(BDS)\Bin\bds.exe</Debugger_HostApplication>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<Version>7.0</Version>
Expand All @@ -82,6 +89,11 @@ $(PreBuildEvent)]]></PreBuildEvent>
<DCC_IncludePath>OldPalette;$(DCC_IncludePath)</DCC_IncludePath>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_MinorVer>8</VerInfo_MinorVer>
<VerInfo_Release>9</VerInfo_Release>
<VerInfo_Keys>CompanyName=Andreas Hausladen;FileVersion=2.8.9.575;InternalName=;LegalCopyright=(C) 2006-2022 Andreas Hausladen;LegalTrademarks=;OriginalFilename=DDevExtensions.dll;ProductName=DDevExtensions;ProductVersion=2.89;Comments=;Last Compile=2022-03-21 18:22</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_DcuOutput>lib\debug</DCC_DcuOutput>
<MapFile>3</MapFile>
Expand Down
14 changes: 12 additions & 2 deletions Code/DDevExtensions/D_D120/DDevExtensions.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
<CfgParent>Base</CfgParent>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
<Cfg_1_Win32>true</Cfg_1_Win32>
<CfgParent>Cfg_1</CfgParent>
<Cfg_1>true</Cfg_1>
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent>
Expand Down Expand Up @@ -69,6 +75,7 @@
$(PreBuildEvent)]]></PreBuildEvent>
<Debugger_LoadAllSymbols>false</Debugger_LoadAllSymbols>
<Debugger_HostApplication>$(BDS)\Bin\bds.exe</Debugger_HostApplication>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1)'!=''">
<Version>7.0</Version>
Expand All @@ -82,6 +89,9 @@ $(PreBuildEvent)]]></PreBuildEvent>
<DCC_IncludePath>OldPalette;$(DCC_IncludePath)</DCC_IncludePath>
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_DcuOutput>lib\debug</DCC_DcuOutput>
<MapFile>3</MapFile>
Expand Down Expand Up @@ -143,8 +153,8 @@ $(PreBuildEvent)]]></PreBuildEvent>
<Source Name="MainSource">DDevExtensions.dpr</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<ModelSupport>False</ModelSupport>
Expand Down
6 changes: 4 additions & 2 deletions Code/DDevExtensions/Installer/DDevExtensionsReg.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<BT_BuildType>Debug</BT_BuildType>
<Manifest_File>(Ohne)</Manifest_File>
<DCC_MapFile>0</DCC_MapFile>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<VerInfo_MinorVer>7</VerInfo_MinorVer>
Expand Down Expand Up @@ -159,8 +161,8 @@
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Platforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -489,12 +489,17 @@ procedure TNativeProgressForm.SetMaxFiles(const Value: Integer);
// WriteLn(Form.Components[I].Name + ': ' + Form.Components[I].ClassName);

pnErrors := Form.FindComponent('pnErrors') as TControl;
// In Delphi 11.1 the ProgressBar must be placed below the "Hints" panel:
{$IF declared(RTLVersion111)}{$IF RTLVersion111}
pnErrors := Form.FindComponent('pnHints') as TControl;
{$IFEND}{$IFEND}
TotalLines := GetLabel('TotalLines');
if (pnErrors is TPanel) and (TotalLines <> nil) then
begin
X := Form.ScreenToClient(pnErrors.ClientToScreen(Point(0, 0))).X;
Y := Form.ScreenToClient(TotalLines.ClientToScreen(Point(TotalLines.Top, 0))).Y;
FProgressBar.SetBounds(X, Y + 2, pnErrors.Width, 7);
FProgressBar.ScaleForPPI(Form.CurrentPPI);
FProgressBar.SetBounds(X, Y + 2, pnErrors.Width, TotalLines.Height div 2);
end
else // Fallback
FProgressBar.SetBounds(384, 187 + 2, 162, 7);
Expand Down
2 changes: 1 addition & 1 deletion Code/DDevExtensions/Source/version.inc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VersionNumber = '2.88';
VersionNumber = '2.90';
2 changes: 1 addition & 1 deletion Code/DDevExtensions/jedi
Submodule jedi updated 1 files
+101 −168 jedi.inc
Binary file modified CompileInterceptor/Bin/CompileInterceptorW.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion CompileInterceptor/Source/CompileInterceptor.inc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{$I ..\jedi\jedi.inc}
{$I ..\..\Code\DDevExtensions\jedi\jedi.inc}

Loading