Merge branch 'feature/update-delphi-support-to-10.4'

delphidabbler · delphidabbler · commit 2cd7ad1f82a0 · 2020-07-16T20:25:59.000+01:00
diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
@@ -247,6 +247,15 @@ <h4>
   <li>
     <em>D101B</em> &ndash; Delphi 10.1 Berlin
   </li>
+  <li>
+    <em>D102T</em> &ndash; Delphi 10.2 Tokyo
+  </li>
+  <li>
+    <em>D103R</em> &ndash; Delphi 10.3 Rio
+  </li>
+  <li>
+    <em>D104S</em> &ndash; Delphi 10.4 Sydney
+  </li>
   <li>
     <em>FPC</em> &ndash; Free Pascal
   </li>
@@ -536,6 +545,24 @@ <h4>
   <dd>
     Indicates whether Delphi 10.1 Berlin was included in the search.
   </dd>
+  <dt>
+    <code class="key">D102T</code> (Boolean)
+  </dt>
+  <dd>
+    Indicates whether Delphi 10.2 Tokyo was included in the search.
+  </dd>
+  <dt>
+    <code class="key">D103R</code> (Boolean)
+  </dt>
+  <dd>
+    Indicates whether Delphi 10.3 Rio was included in the search.
+  </dd>
+  <dt>
+    <code class="key">D104S</code> (Boolean)
+  </dt>
+  <dd>
+    Indicates whether Delphi 10.4 Sydney was included in the search.
+  </dd>
   <dt>
     <code class="key">FPC</code> (Boolean)
   </dt>
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
@@ -551,6 +551,15 @@ <h2>
           <li>
             <em>d101b</em> &ndash; Delphi 10.1 Berlin compiler
           </li>
+          <li>
+            <em>d102t</em> &ndash; Delphi 10.2 Tokyo compiler
+          </li>
+          <li>
+            <em>d103r</em> &ndash; Delphi 10.3 Rio compiler
+          </li>
+          <li>
+            <em>d104s</em> &ndash; Delphi 10.4 Sydney compiler
+          </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler
           </li>
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
@@ -196,6 +196,9 @@ <h4>
 DelphiXE8=&lt;Y|N|Q|W&gt;
 Delphi10S=&lt;Y|N|Q|W&gt;
 Delphi101B=&lt;Y|N|Q|W&gt;
+Delphi102T=&lt;Y|N|Q|W&gt;
+Delphi103R=&lt;Y|N|Q|W&gt;
+Delphi104S=&lt;Y|N|Q|W&gt;
 FPC=&lt;Y|N|Q|W&gt;
 Extra=&lt;extra-info-REML&gt;
 StandardFormat=&lt;0|1&gt;
@@ -403,6 +406,15 @@ <h4>
       <li>
         <code class="key">Delphi101B</code> – Delphi 10.1 Berlin compiler
       </li>
+      <li>
+        <code class="key">Delphi102T</code> – Delphi 10.2 Tokyo compiler
+      </li>
+      <li>
+        <code class="key">Delphi103R</code> – Delphi 10.3 Rio compiler
+      </li>
+      <li>
+        <code class="key">Delphi104S</code> – Delphi 10.4 Sydney compiler
+      </li>
       <li>
         <code class="key">FPC</code> – Free Pascal compiler
       </li>
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
@@ -569,6 +569,15 @@ <h3>
           <li>
             <em>d101b</em> &ndash; Delphi 10.1 Berlin compiler
           </li>
+          <li>
+            <em>d102t</em> &ndash; Delphi 10.2 Tokyo compiler
+          </li>
+          <li>
+            <em>d103r</em> &ndash; Delphi 10.3 Rio compiler
+          </li>
+          <li>
+            <em>d104s</em> &ndash; Delphi 10.4 Sydney compiler
+          </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler
           </li>
diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt
@@ -14,7 +14,7 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
 user-defined snippets.
 
 It displays details of each snippet in the database and can test-compile them
-with each installed Win32 version of Delphi from Delphi 2 to Delphi 10.1 Berlin
+with each installed Win32 version of Delphi from Delphi 2 to Delphi 10.4 Sydney
 and Free Pascal.
 
 Compilable Pascal units can be created that contain selected snippets.
@@ -201,7 +201,7 @@ Configuring CodeSnip to Work With Your Compilers
 ================================================================================
 
 A feature of CodeSnip is its ability to test compile snippets with any installed
-Windows 32 version of Delphi (from Delphi 2 to Delphi 10.1 Berlin) and
+Windows 32 version of Delphi (from Delphi 2 to Delphi 10.4 Sydney) and
 FreePascal, providing some simple rules are followed.
 
 When CodeSnip is first installed it knows nothing about the available compilers
@@ -218,7 +218,7 @@ dialogue" in the help file index).
 
 Each user can configure compilers differently.
 
-Delphi XE2 to XE8 and Delphi 10.1 Berlin may need to be configured to search for
+Delphi XE2 to XE8 and Delphi 10.4 Sydney may need to be configured to search for
 required units in the correct namespaces. This is explained in the Add/Edit
 Snippet Dialogue Box help topic and in the FAQ at
 https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-1
diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
@@ -144,6 +144,12 @@ function TBDSCompiler.GetIDString: string;
       Result := 'D10S';
     ciD101B:
       Result := 'D101B';
+    ciD102T:
+      Result := 'D102T';
+    ciD103R:
+      Result := 'D103R';
+    ciD104S:
+      Result := 'D104S';
     else
       raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
   end;
@@ -162,6 +168,9 @@ function TBDSCompiler.GetName: string;
   sDelphiXE8 = 'Delphi XE8';            // name of Delphi XE8 compiler
   sDelphi10S = 'Delphi 10 Seattle';     // name of Delphi 10 compiler
   sDelphi101B = 'Delphi 10.1 Berlin';   // name of Delphi 10.1 compiler
+  sDelphi102T = 'Delphi 10.2 Tokyo';    // name of Delphi 10.2 compiler
+  sDelphi103R = 'Delphi 10.3 Rio';      // name of Delphi 10.3 compiler
+  sDelphi104S = 'Delphi 10.4 Sydney';   // name of Delphi 10.4 compiler
 begin
   case GetID of
     ciDXE:
@@ -184,6 +193,12 @@ function TBDSCompiler.GetName: string;
       Result := sDelphi10S;
     ciD101B:
       Result := sDelphi101B;
+    ciD102T:
+      Result := sDelphi102T;
+    ciD103R:
+      Result := sDelphi103R;
+    ciD104S:
+      Result := sDelphi104S;
     else
       Result := Format(sCompilerName, [ProductVersion]);
   end;
@@ -214,6 +229,9 @@ function TBDSCompiler.InstallationRegKey: string;
     ciDXE8    : Result := '\Software\Embarcadero\BDS\16.0';
     ciD10S    : Result := '\Software\Embarcadero\BDS\17.0';
     ciD101B   : Result := '\Software\Embarcadero\BDS\18.0';
+    ciD102T   : Result := '\Software\Embarcadero\BDS\19.0';
+    ciD103R   : Result := '\Software\Embarcadero\BDS\20.0';
+    ciD104S   : Result := '\Software\Embarcadero\BDS\21.0';
     else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
   end;
 end;
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
@@ -40,6 +40,9 @@ interface
     ciDXE8,                             // Delphi XE8
     ciD10S,                             // Delphi 10 Seattle
     ciD101B,                            // Delphi 10.1 Berlin
+    ciD102T,                            // Delphi 10.2 Tokyo
+    ciD103R,                            // Delphi 10.3 Rio
+    ciD104S,                            // Delphi 10.4 Sydney
     ciFPC                               // Free Pascal
   );
 
@@ -52,7 +55,8 @@ interface
   ///  compilers.</summary>
   cBDSCompilers = [
     ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
-    ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B
+    ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B, ciD102T,
+    ciD103R, ciD104S
   ];
 
 const
diff --git a/Src/DBIO.UIniDataReader.pas b/Src/DBIO.UIniDataReader.pas
@@ -235,7 +235,7 @@ implementation
     'Delphi2005Win32', 'Delphi2006Win32', 'Delphi2007', 'Delphi2009Win32',
     'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4',
     'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'Delphi10S',
-    'Delphi101B', 'FPC'
+    'Delphi101B', 'Delphi102T', 'Delphi103R', 'Delphi104S', 'FPC'
   );
 
 { TIniDataReader }
diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas
@@ -679,6 +679,9 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
   AddMenuItem('Delphi XE8', 29.0);
   AddMenuItem('Delphi 10 Seattle', 30.0);
   AddMenuItem('Delphi 10.1 Berlin', 31.0);
+  AddMenuItem('Delphi 10.2 Tokyo', 32.0);
+  AddMenuItem('Delphi 10.3 Rio', 33.0);
+  AddMenuItem('Delphi 10.4 Sydney', 34.0);
 end;
 
 procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);
diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm
@@ -34,7 +34,7 @@ <h1>
     </p>
     <p>
       The supported compilers are the Win32 Delphi compilers from Delphi 2 to
-      Delphi 10.1 Berlin and Free Pascal.
+      Delphi 10.4 Sydney and Free Pascal.
     </p>
     <h2>
       Configuring CodeSnip
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
@@ -281,7 +281,7 @@ <h2>
     </h2>
     <p>
       <em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
-      compilers from Delphi 2 to Delphi 10.1 Berlin. Click the <em>Detect Delphi
+      compilers from Delphi 2 to Delphi 10.4 Sydney. Click the <em>Detect Delphi
       Compilers</em> button to do this. Any supported installed version of
       Delphi will be recorded. This can save considerable time and avoid
       errors.
diff --git a/Src/UXMLDocConsts.pas b/Src/UXMLDocConsts.pas
@@ -67,7 +67,8 @@ interface
     'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
     'd2005', 'd2006', 'd2007', 'd2009', 'd2010',
     'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use},
-    'dXE5', 'dXE6', 'dXE7', 'dXE8', 'd10s', 'd101b',
+    'dXE5', 'dXE6', 'dXE7', 'dXE8',
+    'd10s', 'd101b', 'd102t', 'd103r', 'd104s',
     'fpc'
   );
 
