Defined conditional "ATHENSORBETTER" (was DELPHI12ORBETTER)

talexone · Nov 7, 2023 · 4b9cb8b · 4b9cb8b
1 parent 85d27bc
commit 4b9cb8b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/sources/MVCFramework.JSONRPC.pas b/sources/MVCFramework.JSONRPC.pas
@@ -2909,7 +2909,7 @@ class function TJSONUtilsHelper.JSONObjectToRecord<T>(
   else
   begin
     RaiseSerializationError('Parameter doesn''t support IJSONRPCResponse');
-    {$IF Defined(DELPHI12ORBETTER)}
+    {$IF Defined(ATHENSORBETTER)}
     Result := Default(T);
     {$ENDIF}
   end;

diff --git a/sources/MVCFramework.RESTClient.pas b/sources/MVCFramework.RESTClient.pas
@@ -671,7 +671,7 @@ function TMVCRESTClient.AddBodyFieldFormData(const aName: string; aStreamValue:
   const aContentType: string): IMVCRESTClient;
 begin
   Result := Self;
-  {$IF Defined(DELPHI12ORBETTER)}
+  {$IF Defined(ATHENSORBETTER)}
   GetBodyFormData.AddStream(aName, aStreamValue, False, '', aContentType);
   {$ELSE}
   GetBodyFormData.AddStream(aName, aStreamValue, '', aContentType);
@@ -710,7 +710,7 @@ function TMVCRESTClient.AddFile(const aName, aFileName, aContentType: string): I
 function TMVCRESTClient.AddFile(const aName: string; aFileStreamValue: TStream; const aFileName, aContentType: string): IMVCRESTClient;
 begin
   Result := Self;
-  {$IF Defined(DELPHI12ORBETTER)}
+  {$IF Defined(ATHENSORBETTER)}
   GetBodyFormData.AddStream(aName, aFileStreamValue, False, aFileName, aContentType);
   {$ELSE}
   GetBodyFormData.AddStream(aName, aFileStreamValue, aFileName, aContentType);

diff --git a/sources/dmvcframework.inc b/sources/dmvcframework.inc
@@ -75,8 +75,8 @@ DelphiMVCFramework is compatible with Delphi version XE7 or better
 {$DEFINE ALEXANDRIAORBETTER}
 {$ENDIF}
 
-{$IF CompilerVersion >= 36} // 12
-{$DEFINE DELPHI12ORBETTER}
+{$IF CompilerVersion >= 36} // 12 Athens
+{$DEFINE ATHENSORBETTER}
 {$ENDIF}
 
 {$IFDEF MOBILE}

diff --git a/tasks.py b/tasks.py
@@ -20,16 +20,16 @@
 
 
 delphi_versions = [
-    {"version": "10", "path": "17.0", "desc": "Delphi 10 Seattle"},
+    {"version": "10.0", "path": "17.0", "desc": "Delphi 10 Seattle"},
     {"version": "10.1", "path": "18.0", "desc": "Delphi 10.1 Berlin"},
     {"version": "10.2", "path": "19.0", "desc": "Delphi 10.2 Tokyo"},
     {"version": "10.3", "path": "20.0", "desc": "Delphi 10.3 Rio"},
     {"version": "10.4", "path": "21.0", "desc": "Delphi 10.4 Sydney"},
-    {"version": "11", "path": "22.0", "desc": "Delphi 11 Alexandria"},
+    {"version": "11.0", "path": "22.0", "desc": "Delphi 11 Alexandria"},
     {"version": "11.1", "path": "22.0", "desc": "Delphi 11.1 Alexandria"},
     {"version": "11.2", "path": "22.0", "desc": "Delphi 11.2 Alexandria"},
     {"version": "11.3", "path": "22.0", "desc": "Delphi 11.3 Alexandria"},
-    {"version": "12", "path": "23.0", "desc": "Delphi 12"},
+    {"version": "12.0", "path": "23.0", "desc": "Delphi 12 Athens"},
 ]
 
 
@@ -77,7 +77,7 @@ def build_delphi_project(
     ctx: context.Context, project_filename, config="DEBUG", platform="Win32"
 ):
     delphi_version, rsvars_path = get_best_delphi_version_available()
-
+    print('\nBUILD WITH: ' + delphi_version["desc"])
     cmdline = (
         '"'
         + rsvars_path