Skip to content

chore(windows): Delphi 11/12 source compatibility #16043

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.

Sign up for GitHub

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

Open
MattGyverLee wants to merge 14 commits into
base: master
Choose a base branch
from
Open

chore(windows): Delphi 11/12 source compatibility #16043

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ebc6d2a
chore(windows): Delphi 11/12 source compatibility
MattGyverLee Jun 2, 2026
a57500f
docs(windows): surface KEYMAN_DELPHI_VERSION in windows.md
MattGyverLee Jul 2, 2026
b611e81
revert: drop unnecessary JclSynch.pas Boolean/BOOL cast patches
MattGyverLee Jul 2, 2026
d7b3784
revert: drop JvComponent.pas OldCreateOrder patch pending verification
MattGyverLee Jul 2, 2026
9d53e77
address remaining review points: tripwire acknowledgements, scope
MattGyverLee Jul 2, 2026
736afd9
docs(windows): sync emsdk install version with the pinned minimum
MattGyverLee Jul 3, 2026
9ef5278
fix(devtools): tolerate Delphi 12 EnvOptions.proj Null attrs and Win64x
MattGyverLee Jul 3, 2026
d69d9b7
fix(global): let CustomisationStorage compile under Delphi 12 dcc64
MattGyverLee Jul 3, 2026
4d09020
Reapply JclSynch.pas BOOL casts — needed by TIKE compile chain
MattGyverLee Jul 3, 2026
fc69786
Reapply JvComponent.pas OldCreateOrder patch — needed by TIKE
MattGyverLee Jul 3, 2026
7ebe611
Using the upstream guard for JvComponent.pas
MattGyverLee Jul 9, 2026
1c32b23
fix(windows): align vendored JCL with upstream, apply review suggestions
MattGyverLee Jul 10, 2026
e363227
style(windows): use {$IF Defined()} guards instead of nested {$IFNDEF}
MattGyverLee Jul 10, 2026
90792cf
fix(windows): route JclSynch CreateMutex via RTL for Delphi 12 source…
MattGyverLee Jul 10, 2026
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
/windows/src/**/*.identcache
/windows/src/**/*.vcxproj.user
/windows/src/**/version.res
/windows/src/**/version*.res
/windows/src/**/*.pch
/windows/src/**/*.wixobj
/windows/src/**/*.sbr
Expand Down
6 changes: 6 additions & 0 deletions common/windows/delphi/components/FixedTrackbar.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,22 @@ procedure TTntFixedDrawGrid.WMEraseBkgnd(var Message: TMessage);

Tested on VER320 (10.2)
Tested on VER330 (10.3) - 29 Oct 2019 - mcdurdin
Not yet fully verified against Vcl.Grids.pas in VER350 (11) or VER360 (12);
IFNDEF arms added to unblock compilation, override behaviour retained as-is.
Comment thread
MattGyverLee marked this conversation as resolved.
Outdated
}

{$IFNDEF VER340}
{$MESSAGE WARN 'Not yet checked against Delphi 10.4'}
Comment thread
MattGyverLee marked this conversation as resolved.
Outdated
{$IFNDEF VER330}
{$IFNDEF VER320}
{$IFNDEF VER350}
{$IFNDEF VER360}
Comment thread
MattGyverLee marked this conversation as resolved.
Outdated
{$MESSAGE ERROR 'Check that this fix is still applicable for a new version of Delphi. Checked against Delphi 10.2, 10.3' }
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}

procedure TTntFixedDrawGrid.MouseDown(Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
Expand Down
4 changes: 2 additions & 2 deletions common/windows/delphi/general/CleartypeDrawCharacter.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,11 +591,11 @@ function TestFont(FFontName: string): Boolean;
StrPCopy(lf.lfFaceName, FFontName); //'Code2000');
hdc := GetDC(0);
//FPlane0FontName := 'Code2000';
{$IFDEF VER340}
{$IF Defined(VER340) or Defined(VER350) or Defined(VER360)}
if EnumFontFamiliesEx(hdc, lf, @EnumFallbackFonts, 0, 0) <> 0 then
{$ELSE}
if EnumFontFamiliesEx(hdc, lf, @EnumFallbackFonts, 0, 0) then
{$ENDIF}
{$IFEND}
begin
FPlane0FontName := FFontName;
Result := True;
Expand Down
4 changes: 4 additions & 0 deletions common/windows/delphi/general/JsonUtil.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ function JSONToString(obj: TJSONAncestor; ReplaceSlashes: Boolean = False): stri
begin
builder := TStringBuilder.Create;
try
{$IF Defined(VER350) or Defined(VER360)}
obj.ToChars(builder, []);
{$ELSE}
obj.ToChars(builder);
{$IFEND}
Result := builder.ToString;
finally
builder.Free;
Expand Down
23 changes: 15 additions & 8 deletions common/windows/delphi/tools/devtools/DevIncludePaths.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class function TIncludePaths.AddPathToProjectXML(const ProjectXMLFileName, Path:
doc: IXMLDocument;
sn, node: IXMLNode;
IncludePath: string;
Condition: string;
I: Integer;
begin
if not FileExists(ProjectXMLFileName) then
Expand All @@ -159,16 +160,20 @@ class function TIncludePaths.AddPathToProjectXML(const ProjectXMLFileName, Path:
for I := 0 to node.ChildNodes.Count - 1 do
begin
sn := node.ChildNodes[I];
// Delphi 12 EnvOptions.proj emits an empty <PropertyGroup/> without a
// Condition attribute; convert defensively via VarToStrDef so a Null or
// Empty variant returns '' instead of raising EVariantTypeCastError in Pos().
Condition := VarToStrDef(sn.Attributes['Condition'], '');
if (sn.NodeName = 'PropertyGroup') and
not VarIsNull(sn.Attributes['Condition']) and
((Pos('Win32', sn.Attributes['Condition']) > 0) or
(Pos('Win64', sn.Attributes['Condition']) > 0)) then
((Pos('''Win32''', Condition) > 0) or (Pos('''Win64''', Condition) > 0)) then
begin
IncludePath := sn.ChildNodes['DelphiBrowsingPath'].NodeValue;
// Guard against empty child nodes (e.g. <DelphiBrowsingPath/>) whose
// NodeValue is Null on Delphi 12 and can't coerce to a string directly.
IncludePath := VarToStrDef(sn.ChildNodes['DelphiBrowsingPath'].NodeValue, '');
if AddPathToIncludePath(IncludePath, Path) then
sn.ChildNodes['DelphiBrowsingPath'].nodeValue := IncludePath;

IncludePath := sn.ChildNodes['DelphiLibraryPath'].NodeValue;
IncludePath := VarToStrDef(sn.ChildNodes['DelphiLibraryPath'].NodeValue, '');
if AddPathToIncludePath(IncludePath, Path) then
sn.ChildNodes['DelphiLibraryPath'].nodeValue := IncludePath;
end;
Expand Down Expand Up @@ -256,6 +261,7 @@ class function TIncludePaths.Reset: Boolean;
doc: IXMLDocument;
node: IXMLNode;
ProjectFileName: string;
Condition: string;
I: Integer;
sn: IXMLNode;
begin
Expand Down Expand Up @@ -296,10 +302,11 @@ class function TIncludePaths.Reset: Boolean;
for I := 0 to node.ChildNodes.Count - 1 do
begin
sn := node.ChildNodes[I];
// See AddPathToProjectXML: guard against Delphi 12's empty
// <PropertyGroup/> where Attributes['Condition'] returns a Null variant.
Condition := VarToStrDef(sn.Attributes['Condition'], '');
if (sn.NodeName = 'PropertyGroup') and
not VarIsNull(sn.Attributes['Condition']) and
((Pos('Win32', sn.Attributes['Condition']) > 0) or
(Pos('Win64', sn.Attributes['Condition']) > 0)) then
((Pos('''Win32''', Condition) > 0) or (Pos('''Win64''', Condition) > 0)) then
begin
sn.ChildNodes['DelphiBrowsingPath'].NodeValue := SDefault_DelphiBrowsingPath;
sn.ChildNodes['DelphiLibraryPath'].NodeValue := SDefault_DelphiSearchPath;
Expand Down
8 changes: 8 additions & 0 deletions common/windows/delphi/tools/devtools/SourceRootPath.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@ interface
{$IFDEF VER340}
const DelphiMajorVersion = '21.0';
{$ELSE}
{$IFDEF VER350}
const DelphiMajorVersion = '22.0';
{$ELSE}
{$IFDEF VER360}
const DelphiMajorVersion = '23.0';
{$ELSE}
ERROR: must define Delphi version
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}

const DelphiBasePath = 'C:\Program Files (x86)\Embarcadero\Studio\' + DelphiMajorVersion + '\';

Expand Down
12 changes: 11 additions & 1 deletion common/windows/delphi/web/Keyman.System.HttpServer.Base.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,19 @@ function CrackUTF8ZeroExtendedString(CommandType: THTTPCommandType; const p: str
end;

// Indy's UTF8 handling of URLs is *completely* broken.
// We may need to check this with updated versions of Delphi
// We may need to check this with updated versions of Delphi.
// VER340/VER350/VER360 added to the IFNDEF chain to unblock
// Delphi 10.4/11/12 compilation; whether Indy's URL handling was
// fixed in those versions has not been re-verified — the
// workaround stays applied conservatively.
{$IFNDEF VER330}
{$IFNDEF VER340}
Comment thread
MattGyverLee marked this conversation as resolved.
Outdated
{$IFNDEF VER350}
{$IFNDEF VER360}
ERROR! Check if this is still needed with Delphi update
Comment thread
MattGyverLee marked this conversation as resolved.
Outdated
{$ENDIF}
{$ENDIF}
{$ENDIF}
{$ENDIF}

SetLength(s, p.Length);
Expand Down
18 changes: 11 additions & 7 deletions developer/src/ext/jedi/jcl/jcl/source/common/JclSynch.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,11 +937,15 @@ function TJclCriticalSectionEx.TryEnter: Boolean;

//== { TJclEvent } ===========================================================

// Keyman local patch: Delphi 11/12 compat (vendored JCL). Explicit BOOL() casts
// added below to satisfy Delphi 12's stricter implicit-Boolean->BOOL conversion.
// Backwards-compatible with Delphi 10.3 (BOOL is an ordinal-preserving typecast).
// On JCL refresh from upstream: re-apply if upstream hasn't picked up the cast.

@mcdurdin mcdurdin Jun 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this more deeply. This seems to be total nonsense!

I even took the time to try building with an unmodified JclSynch.pas to verify this -- it is completely unnecessary.

@MattGyverLee MattGyverLee Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair — reverted in dcef4c29cf. Thanks for actually building without it to check. I'd applied the cast because I'd read that Delphi 12 tightened Boolean→BOOL conversions and figured JCL would need updating, but I hadn't actually seen the failure. Should have tried building first.

@MattGyverLee MattGyverLee Jul 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right that a lot of the compile chain doesn't need this patch — but TIKE does. Reapplied in 4d09020486 after hitting the exact error against dcc32 on Delphi 12 CE:

I'd initially reverted the whole JclSynch patch on your feedback and only rediscovered the need when running a fresh TIKE build for the CE workflow verification. Apologies for the churn — the empirical test you asked for was correct methodology, just needed the fuller project set to surface the failure.

@mcdurdin mcdurdin Jul 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just built TIKE in Delphi 12 CE with the original JclSynch.pas.

Image

constructor TJclEvent.Create(SecAttr: PSecurityAttributes; Manual, Signaled: Boolean; const Name: string);
begin
inherited Create;
FName := Name;
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.CreateEvent(SecAttr, Manual, Signaled, PChar(FName));
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.CreateEvent(SecAttr, BOOL(Manual), BOOL(Signaled), PChar(FName));
if FHandle = 0 then
raise EJclEventError.CreateRes(@RsSynchCreateEvent);
FExisted := GetLastError = ERROR_ALREADY_EXISTS;
Expand All @@ -952,7 +956,7 @@ constructor TJclEvent.Open(Access: Cardinal; Inheritable: Boolean;
begin
FName := Name;
FExisted := True;
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.OpenEvent(Access, Inheritable, PChar(Name));
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.OpenEvent(Access, BOOL(Inheritable), PChar(Name));
if FHandle = 0 then
raise EJclEventError.CreateRes(@RsSynchOpenEvent);
end;
Expand Down Expand Up @@ -980,7 +984,7 @@ constructor TJclWaitableTimer.Create(SecAttr: PSecurityAttributes;
begin
FName := Name;
FResume := False;
FHandle := CreateWaitableTimer(SecAttr, Manual, PChar(Name));
FHandle := CreateWaitableTimer(SecAttr, BOOL(Manual), PChar(Name));
if FHandle = 0 then
raise EJclWaitableTimerError.CreateRes(@RsSynchCreateWaitableTimer);
FExisted := GetLastError = ERROR_ALREADY_EXISTS;
Expand All @@ -1000,7 +1004,7 @@ constructor TJclWaitableTimer.Open(Access: Cardinal; Inheritable: Boolean;
FExisted := True;
FName := Name;
FResume := False;
FHandle := OpenWaitableTimer(Access, Inheritable, PChar(Name));
FHandle := OpenWaitableTimer(Access, BOOL(Inheritable), PChar(Name));
if FHandle = 0 then
raise EJclWaitableTimerError.CreateRes(@RsSynchOpenWaitableTimer);
end;
Expand Down Expand Up @@ -1048,7 +1052,7 @@ constructor TJclSemaphore.Open(Access: Cardinal; Inheritable: Boolean;
begin
FName := Name;
FExisted := True;
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.OpenSemaphore(Access, Inheritable, PChar(Name));
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.OpenSemaphore(Access, BOOL(Inheritable), PChar(Name));
if FHandle = 0 then
raise EJclSemaphoreError.CreateRes(@RsSynchOpenSemaphore);
end;
Expand All @@ -1075,7 +1079,7 @@ constructor TJclMutex.Create(SecAttr: PSecurityAttributes; InitialOwner: Boolean
begin
inherited Create;
FName := Name;
FHandle := JclWin32.CreateMutex(SecAttr, InitialOwner, PChar(Name));
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.CreateMutex(SecAttr, BOOL(InitialOwner), PChar(Name));
if FHandle = 0 then
raise EJclMutexError.CreateRes(@RsSynchCreateMutex);
FExisted := GetLastError = ERROR_ALREADY_EXISTS;
Expand All @@ -1086,7 +1090,7 @@ constructor TJclMutex.Open(Access: Cardinal; Inheritable: Boolean; const Name: s
inherited Create;
FName := Name;
FExisted := True;
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.OpenMutex(Access, Inheritable, PChar(Name));
FHandle := {$IFDEF HAS_UNITSCOPE}Winapi.{$ENDIF}Windows.OpenMutex(Access, BOOL(Inheritable), PChar(Name));
if FHandle = 0 then
raise EJclMutexError.CreateRes(@RsSynchOpenMutex);
end;
Expand Down
8 changes: 8 additions & 0 deletions developer/src/ext/jedi/jvcl/jvcl/run/JvComponent.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,16 @@ constructor TJvForm.Create(AOwner: TComponent);
finally
Exclude(FFormState, fsCreating);
end;
// Keyman local patch: Delphi 11/12 compat (vendored JVCL). The
// OldCreateOrder property was removed in Delphi 11; the modern semantics
// are equivalent to OldCreateOrder=True, so always call DoCreate on
// VER350+. On JVCL refresh from upstream: re-apply if not yet upstreamed.

@mcdurdin mcdurdin Jun 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong according to the documentation for OldCreateOrder.

@MattGyverLee MattGyverLee Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the docs link — I hadn't checked Athens's own documentation, just found somewhere that mentioned OldCreateOrder was removed and applied a defensive patch. Given the JclSynch outcome, this one falls in the same bucket. Reverted in bb05693f6e. If it does turn out to be a real issue on Delphi 12 later, I'll have an actual error message to work from.

@MattGyverLee MattGyverLee Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second vindication — reapplied in fc6978675a after hitting the exact error building TIKE (which pulls in JvDockControlForm, which uses JvComponent):

[dcc32 Error] JvComponent.pas(126): E2003 Undeclared identifier: 'OldCreateOrder'
[dcc32 Fatal Error] JvDockControlForm.pas(2442): F2063 Could not compile used unit 'JvComponent.pas'

The Athens docs you linked may still list OldCreateOrder in some contexts, but Delphi 12 CE's dcc32 says otherwise: TCustomForm.OldCreateOrder genuinely doesn't exist anymore. The patch conditionally calls DoCreate unconditionally on VER350+ (equivalent to what the docs describe as the modern OldCreateOrder=True default) and keeps the runtime check on older Delphis.

Same pattern as JclSynch above: the smaller projects you tested didn't pull JvComponent through their compile chain, so the missing identifier was never referenced. TIKE does.

Apologies again for the churn — trying to be defensive on both patches based on your feedback and it turned out both were needed for the fuller project set.

@mcdurdin mcdurdin Jul 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. OldCreateOrder defaults to False not to True. So, DoCreate should not be called at all.

{$IF Defined(VER350) or Defined(VER360)}
DoCreate;
{$ELSE}
if OldCreateOrder then
DoCreate;
{$IFEND}
end;
finally
GlobalNameSpace.EndWrite;
Expand Down
22 changes: 22 additions & 0 deletions developer/src/ext/mbcolor/mxs.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@
{$define DELPHI_10_UP}
{$endif}

// Keyman local patch: Delphi 11/12 compat (vendored mbcolor). Without
// these blocks DELPHI_*_UP flags are never defined on VER350/VER360,
// which causes HTMLColors.pas to drop "uses Variants" and fail to
// resolve the Null constant. On mbcolor refresh: re-apply if needed.
{$ifdef VER350}
{$define DELPHI_5_UP}
{$define DELPHI_6_UP}
{$define DELPHI_7_UP}
{$define DELPHI_8_UP}
{$define DELPHI_9_UP}
{$define DELPHI_10_UP}
{$endif}

{$ifdef VER360}
{$define DELPHI_5_UP}
{$define DELPHI_6_UP}
{$define DELPHI_7_UP}
{$define DELPHI_8_UP}
{$define DELPHI_9_UP}
{$define DELPHI_10_UP}
{$endif}

{$ifdef VER330}
{$define DELPHI_5_UP}
{$define DELPHI_6_UP}
Expand Down
13 changes: 9 additions & 4 deletions docs/build/windows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ In bash, run the following commands:
cd /c/Projects/keyman
git clone https://github.com/emscripten-core/emsdk
cd emsdk
emsdk install 3.1.58
emsdk activate 3.1.58
emsdk install 3.1.64
emsdk activate 3.1.64
cd upstream/emscripten
npm install
```
Expand All @@ -195,8 +195,8 @@ If you are updating an existing install of Emscripten:
```bash
cd emsdk
git pull
emsdk install 3.1.58
emsdk activate 3.1.58
emsdk install 3.1.64
emsdk activate 3.1.64
cd upstream/emscripten
npm install
```
Expand Down Expand Up @@ -257,6 +257,11 @@ of appropriate node versions during builds.
for a short time. (We are actively working to remove Delphi dependencies
given the licensing issues with using it.)

* If you have Delphi 11 or 12 with a CLI-capable license (Professional or
higher), set `KEYMAN_DELPHI_VERSION` to the Studio path — `22.0` for
Delphi 11, `23.0` for Delphi 12 — before running `build.sh`. The default
(`20.0`, Delphi 10.3) is preserved when the variable is unset.

Start Delphi IDE once after installation as it will create various environment
files and take you through required registration.

Expand Down
6 changes: 4 additions & 2 deletions resources/build/win/configure_environment.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ _build_vs_environment() {

_locate_rsvars() {
#
# Delphi Compiler Configuration - Delphi 10.3.2
# Delphi Compiler Configuration - defaults to Delphi 10.3 (BDS 20.0).
# Override via the KEYMAN_DELPHI_VERSION environment variable to build with
# a newer Delphi installation (e.g., KEYMAN_DELPHI_VERSION=23.0 for Delphi 12).
#
DELPHI_VERSION=20.0
DELPHI_VERSION="${KEYMAN_DELPHI_VERSION:-20.0}"
DCC32PATH="$(cygpath -u "$ProgramFilesx86\\Embarcadero\\Studio\\$DELPHI_VERSION\\bin")"
RSVars_path="$DCC32PATH/rsvars.bat"
}
Expand Down
5 changes: 4 additions & 1 deletion resources/build/win/delphi_environment.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
DELPHIWARNINGS=(-W-MESSAGE_DIRECTIVE -W-IMPLICIT_STRING_CAST -W-IMPLICIT_STRING_CAST_LOSS -W-EXPLICIT_STRING_CAST -W-EXPLICIT_STRING_CAST_LOSS -W-CVT_WCHAR_TO_ACHAR -W-CVT_NARROWING_STRING_LOST -W-CVT_ACHAR_TO_WCHAR -W-CVT_WIDENING_STRING_LOST -W-UNICODE_TO_LOCALE -W-LOCALE_TO_UNICODE -W-IMPLICIT_VARIANTS -W-IMPLICIT_INTEGER_CAST_LOSS -W-IMPLICIT_CONVERSION_LOSS -W-COMBINING_SIGNED_UNSIGNED64 -W-COMBINING_SIGNED_UNSIGNED64)
# !ENDIF

DELPHI_VERSION=20.0
# DELPHI_VERSION defaults to Delphi 10.3 (BDS 20.0). Override via the
# KEYMAN_DELPHI_VERSION environment variable to build with a newer Delphi
# installation (e.g., KEYMAN_DELPHI_VERSION=23.0 for Delphi 12).
DELPHI_VERSION="${KEYMAN_DELPHI_VERSION:-20.0}"
DCC32PATH="$(cygpath -u "$ProgramFilesx86\\Embarcadero\\Studio\\$DELPHI_VERSION\\bin")"

source "$KEYMAN_ROOT/resources/build/win/delphi_environment_generated.inc.sh"
Expand Down
3 changes: 2 additions & 1 deletion resources/builder.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2323,7 +2323,8 @@ builder_describe_platform() {
# Detect delphi compiler (see also delphi_environment.inc.sh)
if builder_is_windows; then
local ProgramFilesx86="$(cygpath -w -F 42)"
if [[ -x "$(cygpath -u "$ProgramFilesx86\\Embarcadero\\Studio\\20.0\\bin\\dcc32.exe")" ]]; then
local _delphi_version="${KEYMAN_DELPHI_VERSION:-20.0}"
if [[ -x "$(cygpath -u "$ProgramFilesx86\\Embarcadero\\Studio\\$_delphi_version\\bin\\dcc32.exe")" ]]; then
builder_installed_tools+=(delphi)
fi
fi
Expand Down
7 changes: 6 additions & 1 deletion windows/src/global/delphi/cust/CustomisationStorage.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,13 @@ function TCustomisationStorage.GetFileOfType(FileType: TCustFileType; StartIndex
{ TCustFileList }

function TCustFileList.AddCustFile: TCustFile;
var
NewObj: TObject;
begin
Result := Items[inherited Add(FObjectClass.Create)];
// Delphi 12 dcc64 rejects the inline form with E2010 'TCustFile' and 'TObject';
// splitting via a local TObject makes the widening explicit.
NewObj := FObjectClass.Create;
Result := Items[inherited Add(NewObj)];
end;

constructor TCustFileList.Create(AObjectClass: TCustFileClass);
Expand Down
Loading