Skip to content

Commit

Permalink
Updated until Delphi 10 Seattle
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelJustin committed Jan 22, 2016
1 parent d7e6b82 commit 51f6bdf
Showing 1 changed file with 160 additions and 10 deletions.
170 changes: 160 additions & 10 deletions src/jedi.inc
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@
DELPHIXE5 Alias for DELPHI19
DELPHI20 Defined when compiling with Delphi XE6 for Win32 (Codename PROTEUS)
DELPHIXE6 Alias for DELPHI20
DELPHI21 Defined when compiling with Delphi XE7 for Win32 (Codename CARPATHIA)
DELPHIXE7 Alias for DELPHI21
DELPHI22 Defined when compiling with Delphi XE8 for Win32 (Codename ELBRUS)
DELPHIXE8 Alias for DELPHI22
DELPHI23 Defined when compiling with Delphi 10 for Win32 (Codename AITANA)
DELPHIX_SEATTLE Alias for DELPHI23
DELPHI1_UP Defined when compiling with Delphi 1 or higher
DELPHI2_UP Defined when compiling with Delphi 2 or higher
DELPHI3_UP Defined when compiling with Delphi 3 or higher
Expand Down Expand Up @@ -182,6 +188,12 @@
DELPHIXE5_UP Alias for DELPHI19_UP
DELPHI20_UP Defined when compiling with Delphi XE6 for Win32 or higher
DELPHIXE6_UP Alias for DELPHI20_UP
DELPHI21_UP Defined when compiling with Delphi XE7 for Win32 or higher
DELPHIXE7_UP Alias for DELPHI21_UP
DELPHI22_UP Defined when compiling with Delphi XE8 for Win32 or higher
DELPHIXE8_UP Alias for DELPHI22_UP
DELPHI23_UP Defined when compiling with Delphi 10 for Win32 or higher
DELPHIX_SEATTLE_UP Alias for DELPHI23_UP
- Kylix Versions
Expand Down Expand Up @@ -222,6 +234,10 @@
DELPHICOMPILER17 Defined when compiling with Delphi Personality of BDS 10.0
DELPHICOMPILER18 Defined when compiling with Delphi Personality of BDS 11.0
DELPHICOMPILER19 Defined when compiling with Delphi Personality of BDS 12.0
DELPHICOMPILER20 Defined when compiling with Delphi Personality of BDS 14.0
DELPHICOMPILER21 Defined when compiling with Delphi Personality of BDS 15.0
DELPHICOMPILER22 Defined when compiling with Delphi Personality of BDS 16.0
DELPHICOMPILER23 Defined when compiling with Delphi Personality of BDS 17.0
DELPHICOMPILER1_UP Defined when compiling with Delphi 1 or higher
DELPHICOMPILER2_UP Defined when compiling with Delphi 2 or higher
DELPHICOMPILER3_UP Defined when compiling with Delphi 3 or higher
Expand All @@ -240,6 +256,10 @@
DELPHICOMPILER17_UP Defined when compiling with Delphi XE3 for Win32 or higher
DELPHICOMPILER18_UP Defined when compiling with Delphi XE4 for Win32 or higher
DELPHICOMPILER19_UP Defined when compiling with Delphi XE5 for Win32 or higher
DELPHICOMPILER20_UP Defined when compiling with Delphi XE6 for Win32 or higher
DELPHICOMPILER21_UP Defined when compiling with Delphi XE7 for Win32 or higher
DELPHICOMPILER22_UP Defined when compiling with Delphi XE8 for Win32 or higher
DELPHICOMPILER23_UP Defined when compiling with Delphi 10 for Win32 or higher
- C++Builder Versions
Expand All @@ -264,6 +284,10 @@
BCB17 Defined when compiling with C++Builder Personality of RAD Studio XE3 (also known as C++Builder XE3) (Codename WATERDRAGON)
BCB18 Defined when compiling with C++Builder Personality of RAD Studio XE4 (also known as C++Builder XE4) (Codename QUINTESSENCE)
BCB19 Defined when compiling with C++Builder Personality of RAD Studio XE5 (also known as C++Builder XE5) (Codename ZEPHYR)
BCB20 Defined when compiling with C++Builder Personality of RAD Studio XE6 (also known as C++Builder XE6) (Codename PROTEUS)
BCB21 Defined when compiling with C++Builder Personality of RAD Studio XE7 (also known as C++Builder XE7) (Codename CARPATHIA)
BCB22 Defined when compiling with C++Builder Personality of RAD Studio XE8 (also known as C++Builder XE8) (Codename ELBRUS)
BCB23 Defined when compiling with C++Builder Personality of RAD Studio 10 Seattle (also known as C++Builder 10 Seattle) (Codename AITANA)
BCB1_UP Defined when compiling with C++Builder 1 or higher
BCB3_UP Defined when compiling with C++Builder 3 or higher
BCB4_UP Defined when compiling with C++Builder 4 or higher
Expand All @@ -279,6 +303,9 @@
BCB18_UP Defined when compiling with C++Builder Personality of RAD Studio XE4 or higher
BCB19_UP Defined when compiling with C++Builder Personality of RAD Studio XE5 or higher
BCB20_UP Defined when compiling with C++Builder Personality of RAD Studio XE6 or higher
BCB21_UP Defined when compiling with C++Builder Personality of RAD Studio XE7 or higher
BCB22_UP Defined when compiling with C++Builder Personality of RAD Studio XE8 or higher
BCB23_UP Defined when compiling with C++Builder Personality of RAD Studio 10 or higher
- RAD Studio / Borland Developer Studio Versions
Expand All @@ -304,6 +331,10 @@
BDS10 Defined when compiling with BDS 10.0 (Embarcadero RAD Studio XE3) (Codename WATERDRAGON)
BDS11 Defined when compiling with BDS 11.0 (Embarcadero RAD Studio XE4) (Codename QUINTESSENCE)
BDS12 Defined when compiling with BDS 12.0 (Embarcadero RAD Studio XE5) (Codename ZEPHYR)
BDS14 Defined when compiling with BDS 14.0 (Embarcadero RAD Studio XE6) (Codename PROTEUS)
BDS15 Defined when compiling with BDS 15.0 (Embarcadero RAD Studio XE7) (Codename CARPATHIA)
BDS16 Defined when compiling with BDS 16.0 (Embarcadero RAD Studio XE8) (Codename ELBRUS)
BDS17 Defined when compiling with BDS 17.0 (Embarcadero RAD Studio 10) (Codename AITANA)
BDS2_UP Defined when compiling with BDS 2.0 or higher
BDS3_UP Defined when compiling with BDS 3.0 or higher
BDS4_UP Defined when compiling with BDS 4.0 or higher
Expand All @@ -316,6 +347,9 @@
BDS11_UP Defined when compiling with BDS 11.0 or higher
BDS12_UP Defined when compiling with BDS 12.0 or higher
BDS14_UP Defined when compiling with BDS 14.0 or higher
BDS15_UP Defined when compiling with BDS 15.0 or higher
BDS16_UP Defined when compiling with BDS 16.0 or higher
BDS17_UP Defined when compiling with BDS 17.0 or higher
- Compiler Versions
Expand Down Expand Up @@ -346,6 +380,10 @@
COMPILER17 Defined when compiling with Delphi or C++Builder Personalities of BDS 10.0
COMPILER18 Defined when compiling with Delphi or C++Builder Personalities of BDS 11.0
COMPILER19 Defined when compiling with Delphi or C++Builder Personalities of BDS 12.0
COMPILER20 Defined when compiling with Delphi or C++Builder Personalities of BDS 14.0
COMPILER21 Defined when compiling with Delphi or C++Builder Personalities of BDS 15.0
COMPILER22 Defined when compiling with Delphi or C++Builder Personalities of BDS 16.0
COMPILER23 Defined when compiling with Delphi or C++Builder Personalities of BDS 17.0
COMPILER1_UP Defined when compiling with Delphi 1 or higher
COMPILER2_UP Defined when compiling with Delphi 2 or C++Builder 1 or higher
COMPILER3_UP Defined when compiling with Delphi 3 or higher
Expand All @@ -366,6 +404,9 @@
COMPILER18_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 11.0 or higher
COMPILER19_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 12.0 or higher
COMPILER20_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 14.0 or higher
COMPILER21_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 15.0 or higher
COMPILER22_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 16.0 or higher
COMPILER23_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 17.0 or higher
- RTL Versions
Expand Down Expand Up @@ -403,6 +444,9 @@
RTL250_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 11.0 or higher
RTL260_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 12.0 or higher
RTL270_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 14.0 or higher
RTL280_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 15.0 or higher
RTL290_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 16.0 or higher
RTL300_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 17.0 or higher
- CLR Versions
Expand Down Expand Up @@ -444,7 +488,7 @@
SUPPORTS_NODEFINE Compiler supports the $NODEFINE directive (D4+/BCB3+)
SUPPORTS_LONGWORD Compiler supports the LongWord type (unsigned 32 bit) (D4+/BCB4+)
SUPPORTS_INT64 Compiler supports the Int64 type (D4+/BCB4+)
SUPPORTS_UINT64 Compiler supports the UInt64 type (D XE+ ?)
SUPPORTS_UINT64 Compiler supports the UInt64 type (D7+)
SUPPORTS_DYNAMICARRAYS Compiler supports dynamic arrays (D4+/BCB4+)
SUPPORTS_DEFAULTPARAMS Compiler supports default parameters (D4+/BCB4+)
SUPPORTS_OVERLOAD Compiler supports overloading (D4+/BCB4+)
Expand Down Expand Up @@ -509,6 +553,11 @@
DEPRECATED_SYSUTILS_ANSISTRINGS AnsiString functions from SysUtils are deprecated and moved to System.AnsiStrings (D18+)
HAS_PROPERTY_STYLEELEMENTS TControl has a StyleElements property (D17+)
HAS_AUTOMATIC_DB_FIELDS Database fields are automatically created/refreshed (D20+)
HAS_EARGUMENTEXCEPTION Exception class EArgumentException is available (D14+)
HAS_ENOTIMPLEMENTED Exception class ENotImplemented is available (D15+)
HAS_UNIT_VCL_THEMES Unit Vcl.Themes is available (D16+)
HAS_UNIT_UXTHEME Unit (Vcl.)UxTheme is available (D7+)
HAS_EXCEPTION_STACKTRACE Exception class has the StackTrace propery (D12+)
- Compiler Settings
Expand Down Expand Up @@ -871,20 +920,65 @@
{$ENDIF BCB}
{$DEFINE RTL270_UP}
{$UNDEF UNKNOWN_COMPILER_VERSION}
{$ENDIF VER260}
{$ENDIF VER270}

{$IFDEF VER280} // RAD Studio XE7
{$DEFINE BDS}
{$DEFINE BDS15}
{$DEFINE COMPILER21}
{$IFDEF BCB}
{$DEFINE BCB21}
{$ELSE}
{$DEFINE DELPHI21}
{$DEFINE DELPHIXE7} // synonym to DELPHI21
{$DEFINE DELPHICOMPILER21}
{$ENDIF BCB}
{$DEFINE RTL280_UP}
{$UNDEF UNKNOWN_COMPILER_VERSION}
{$ENDIF VER280}

{$IFDEF VER290} // RAD Studio XE8
{$DEFINE BDS}
{$DEFINE BDS16}
{$DEFINE COMPILER22}
{$IFDEF BCB}
{$DEFINE BCB22}
{$ELSE}
{$DEFINE DELPHI22}
{$DEFINE DELPHIXE8} // synonym to DELPHI22
{$DEFINE DELPHICOMPILER22}
{$ENDIF BCB}
{$DEFINE RTL290_UP}
{$UNDEF UNKNOWN_COMPILER_VERSION}
{$ENDIF VER290}

{$IFDEF VER300} // RAD Studio 10
{$DEFINE BDS}
{$DEFINE BDS17}
{$DEFINE COMPILER23}
{$IFDEF BCB}
{$DEFINE BCB23}
{$ELSE}
{$DEFINE DELPHI23}
{$DEFINE DELPHIX_SEATTLE} // synonym to DELPHI23
{$DEFINE DELPHICOMPILER23}
{$ENDIF BCB}
{$DEFINE RTL300_UP}
{$UNDEF UNKNOWN_COMPILER_VERSION}
{$ENDIF VER290}

{$IFDEF UNKNOWN_COMPILER_VERSION} // adjust for newer version (always use latest version)
{$DEFINE BDS}
{$DEFINE BDS14}
{$DEFINE COMPILER20}
{$DEFINE BDS17}
{$DEFINE COMPILER23}
{$IFDEF BCB}
{$DEFINE BCB20}
{$DEFINE BCB23}
{$ELSE}
{$DEFINE DELPHI20}
{$DEFINE DELPHIXE6} // synonym to DELPHI20
{$DEFINE DELPHICOMPILER20}
{$DEFINE DELPHI23}
{$DEFINE DELPHIX_SEATTLE} // synonym to DELPHI23
{$DEFINE DELPHICOMPILER23}
{$ENDIF BCB}
{$DEFINE RTL270_UP}
{$DEFINE RTL300_UP}
{$UNDEF UNKNOWN_COMPILER_VERSION}
{$ENDIF}

Expand All @@ -904,6 +998,9 @@
{ DELPHIX_UP from DELPHIX mappings }
{------------------------------------------------------------------------------}

{$IFDEF DELPHI23} {$DEFINE DELPHI23_UP} {$ENDIF}
{$IFDEF DELPHI22} {$DEFINE DELPHI22_UP} {$ENDIF}
{$IFDEF DELPHI21} {$DEFINE DELPHI21_UP} {$ENDIF}
{$IFDEF DELPHI20} {$DEFINE DELPHI20_UP} {$ENDIF}
{$IFDEF DELPHI19} {$DEFINE DELPHI19_UP} {$ENDIF}
{$IFDEF DELPHI18} {$DEFINE DELPHI18_UP} {$ENDIF}
Expand All @@ -928,6 +1025,21 @@
{ DELPHIX_UP from DELPHIX_UP mappings }
{------------------------------------------------------------------------------}

{$IFDEF DELPHI23_UP}
{$DEFINE DELPHIX_SEATTLE_UP} // synonym to DELPHI23_UP
{$DEFINE DELPHI22_UP}
{$ENDIF}

{$IFDEF DELPHI22_UP}
{$DEFINE DELPHIXE8_UP} // synonym to DELPHI22_UP
{$DEFINE DELPHI21_UP}
{$ENDIF}

{$IFDEF DELPHI21_UP}
{$DEFINE DELPHIXE7_UP} // synonym to DELPHI21_UP
{$DEFINE DELPHI20_UP}
{$ENDIF}

{$IFDEF DELPHI20_UP}
{$DEFINE DELPHIXE6_UP} // synonym to DELPHI20_UP
{$DEFINE DELPHI19_UP}
Expand Down Expand Up @@ -995,6 +1107,9 @@
{ BCBX_UP from BCBX mappings }
{------------------------------------------------------------------------------}

{$IFDEF BCB23} {$DEFINE BCB23_UP} {$ENDIF}
{$IFDEF BCB22} {$DEFINE BCB22_UP} {$ENDIF}
{$IFDEF BCB21} {$DEFINE BCB21_UP} {$ENDIF}
{$IFDEF BCB20} {$DEFINE BCB20_UP} {$ENDIF}
{$IFDEF BCB19} {$DEFINE BCB19_UP} {$ENDIF}
{$IFDEF BCB18} {$DEFINE BCB18_UP} {$ENDIF}
Expand All @@ -1015,6 +1130,9 @@
{ BCBX_UP from BCBX_UP mappings }
{------------------------------------------------------------------------------}

{$IFDEF BCB23_UP} {$DEFINE BCB22_UP} {$ENDIF}
{$IFDEF BCB22_UP} {$DEFINE BCB21_UP} {$ENDIF}
{$IFDEF BCB21_UP} {$DEFINE BCB20_UP} {$ENDIF}
{$IFDEF BCB20_UP} {$DEFINE BCB19_UP} {$ENDIF}
{$IFDEF BCB19_UP} {$DEFINE BCB18_UP} {$ENDIF}
{$IFDEF BCB18_UP} {$DEFINE BCB17_UP} {$ENDIF}
Expand All @@ -1034,6 +1152,9 @@
{ BDSX_UP from BDSX mappings }
{------------------------------------------------------------------------------}

{$IFDEF BDS17} {$DEFINE BDS17_UP} {$ENDIF}
{$IFDEF BDS16} {$DEFINE BDS16_UP} {$ENDIF}
{$IFDEF BDS15} {$DEFINE BDS15_UP} {$ENDIF}
{$IFDEF BDS14} {$DEFINE BDS14_UP} {$ENDIF}
{$IFDEF BDS12} {$DEFINE BDS12_UP} {$ENDIF}
{$IFDEF BDS11} {$DEFINE BDS11_UP} {$ENDIF}
Expand All @@ -1051,6 +1172,9 @@
{ BDSX_UP from BDSX_UP mappings }
{------------------------------------------------------------------------------}

{$IFDEF BDS17_UP} {$DEFINE BDS16_UP} {$ENDIF}
{$IFDEF BDS16_UP} {$DEFINE BDS15_UP} {$ENDIF}
{$IFDEF BDS15_UP} {$DEFINE BDS14_UP} {$ENDIF}
{$IFDEF BDS14_UP} {$DEFINE BDS12_UP} {$ENDIF}
{$IFDEF BDS12_UP} {$DEFINE BDS11_UP} {$ENDIF}
{$IFDEF BDS11_UP} {$DEFINE BDS10_UP} {$ENDIF}
Expand All @@ -1067,6 +1191,9 @@
{ DELPHICOMPILERX_UP from DELPHICOMPILERX mappings }
{------------------------------------------------------------------------------}

{$IFDEF DELPHICOMPILER23} {$DEFINE DELPHICOMPILER23_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER22} {$DEFINE DELPHICOMPILER22_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER21} {$DEFINE DELPHICOMPILER21_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER20} {$DEFINE DELPHICOMPILER20_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER19} {$DEFINE DELPHICOMPILER19_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER18} {$DEFINE DELPHICOMPILER18_UP} {$ENDIF}
Expand All @@ -1091,6 +1218,9 @@
{ DELPHICOMPILERX_UP from DELPHICOMPILERX_UP mappings }
{------------------------------------------------------------------------------}

{$IFDEF DELPHICOMPILER23_UP} {$DEFINE DELPHICOMPILER22_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER22_UP} {$DEFINE DELPHICOMPILER21_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER21_UP} {$DEFINE DELPHICOMPILER20_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER20_UP} {$DEFINE DELPHICOMPILER19_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER19_UP} {$DEFINE DELPHICOMPILER18_UP} {$ENDIF}
{$IFDEF DELPHICOMPILER18_UP} {$DEFINE DELPHICOMPILER17_UP} {$ENDIF}
Expand All @@ -1115,6 +1245,9 @@
{ COMPILERX_UP from COMPILERX mappings }
{------------------------------------------------------------------------------}

{$IFDEF COMPILER23} {$DEFINE COMPILER23_UP} {$ENDIF}
{$IFDEF COMPILER22} {$DEFINE COMPILER22_UP} {$ENDIF}
{$IFDEF COMPILER21} {$DEFINE COMPILER21_UP} {$ENDIF}
{$IFDEF COMPILER20} {$DEFINE COMPILER20_UP} {$ENDIF}
{$IFDEF COMPILER19} {$DEFINE COMPILER19_UP} {$ENDIF}
{$IFDEF COMPILER18} {$DEFINE COMPILER18_UP} {$ENDIF}
Expand All @@ -1140,6 +1273,9 @@
{ COMPILERX_UP from COMPILERX_UP mappings }
{------------------------------------------------------------------------------}

{$IFDEF COMPILER23_UP} {$DEFINE COMPILER22_UP} {$ENDIF}
{$IFDEF COMPILER22_UP} {$DEFINE COMPILER21_UP} {$ENDIF}
{$IFDEF COMPILER21_UP} {$DEFINE COMPILER20_UP} {$ENDIF}
{$IFDEF COMPILER20_UP} {$DEFINE COMPILER19_UP} {$ENDIF}
{$IFDEF COMPILER19_UP} {$DEFINE COMPILER18_UP} {$ENDIF}
{$IFDEF COMPILER18_UP} {$DEFINE COMPILER17_UP} {$ENDIF}
Expand All @@ -1164,6 +1300,9 @@
{ RTLX_UP from RTLX_UP mappings }
{------------------------------------------------------------------------------}

{$IFDEF RTL300_UP} {$DEFINE RTL290_UP} {$ENDIF}
{$IFDEF RTL290_UP} {$DEFINE RTL280_UP} {$ENDIF}
{$IFDEF RTL280_UP} {$DEFINE RTL270_UP} {$ENDIF}
{$IFDEF RTL270_UP} {$DEFINE RTL260_UP} {$ENDIF}
{$IFDEF RTL260_UP} {$DEFINE RTL250_UP} {$ENDIF}
{$IFDEF RTL250_UP} {$DEFINE RTL240_UP} {$ENDIF}
Expand Down Expand Up @@ -1385,6 +1524,7 @@

{$IFDEF COMPILER7_UP}
{$DEFINE SUPPORTS_UNSAFE_WARNINGS}
{$DEFINE SUPPORTS_UINT64}
{$ENDIF COMPILER7_UP}

{$IFDEF COMPILER9_UP}
Expand Down Expand Up @@ -1459,6 +1599,10 @@
{$DEFINE XPLATFORM_RTL}
{$ENDIF RTL140_UP}

{$IFDEF RTL150_UP}
{$DEFINE HAS_UNIT_UXTHEME}
{$ENDIF RTL150_UP}

{$IFDEF RTL170_UP}
{$DEFINE HAS_UNIT_HTTPPROD}
{$ENDIF RTL170_UP}
Expand All @@ -1471,16 +1615,22 @@
{$DEFINE HAS_UNIT_ANSISTRINGS}
{$DEFINE HAS_UNIT_PNGIMAGE}
{$DEFINE HAS_UNIT_CHARACTER}
{$DEFINE HAS_EXCEPTION_STACKTRACE}
{$ENDIF RTL200_UP}

{$IFDEF RTL210_UP}
{$DEFINE HAS_EARGUMENTEXCEPTION}
{$ENDIF RTL210_UP}

{$IFDEF RTL220_UP}
{$DEFINE SUPPORTS_UINT64}
{$DEFINE HAS_UNIT_REGULAREXPRESSIONSAPI}
{$DEFINE HAS_ENOTIMPLEMENTED}
{$ENDIF RTL220_UP}

{$IFDEF RTL230_UP}
{$DEFINE HAS_UNITSCOPE}
{$DEFINE HAS_UNIT_SYSTEM_UITYPES}
{$DEFINE HAS_UNIT_VCL_THEMES}
{$ENDIF RTL230_UP}

{$IFDEF RTL240_UP}
Expand Down

0 comments on commit 51f6bdf

Please sign in to comment.