Merged revision(s) 3462-4550, 4566-4577 from tags/version-4.9.0:

delphidabbler · delphidabbler · commit 741dcebae2d2 · 2014-04-30T16:08:05.000Z
This updates the trunk with changes made in release 4.9.0.
diff --git a/Docs/ChangeLogs/ChangeLog-v4.txt b/Docs/ChangeLogs/ChangeLog-v4.txt
@@ -11,6 +11,11 @@
 ; Change Log for CodeSnip Release 4
 ; ------------------------------------------------------------------------------
 
+Release v4.9.0 of 30 April 2014
++ Added support for test compilation with, and detection of, Delphi XE6 compiler.
++ Updated documentation re changes.
++ Updated help file re changes.
+
 Release v4.8.7 of 06 March 2014
 + Changed so that automatic bug checker now correctly records last update date. This fixes bug #93 (http://bit.ly/NmSQUt).
 + Updated to use v2 of the DelphiDabbler CodeSnip update web service when checking for availability of program updates.
diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -282,6 +282,9 @@ <h4>
   <li>
     <em>DXE5</em> &ndash; Delphi XE5
   </li>
+  <li>
+    <em>DXE6</em> &ndash; Delphi XE6
+  </li>
   <li>
     <em>FPC</em> &ndash; Free Pascal
   </li>
@@ -558,6 +561,12 @@ <h4>
   <dd>
     Indicates whether Delphi XE5 was included in search.
   </dd>
+  <dt>
+    <strong>DXE6</strong> (Boolean)
+  </dt>
+  <dd>
+    Indicates whether Delphi XE6 was included in search.
+  </dd>
   <dt>
     <strong>FPC</strong> (Boolean)
   </dt>
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -506,6 +506,9 @@ <h2>
           <li>
             <em>dXE5</em> &ndash; Delphi XE5 compiler
           </li>
+          <li>
+            <em>dXE6</em> &ndash; Delphi XE6 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
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -153,6 +153,7 @@ <h3>
 DelphiXE3=&lt;Y|N|Q|W&gt;
 DelphiXE4=&lt;Y|N|Q|W&gt;
 DelphiXE5=&lt;Y|N|Q|W&gt;
+DelphiXE6=&lt;Y|N|Q|W&gt;
 FPC=&lt;Y|N|Q|W&gt;
 Extra=&lt;extra-info-REML&gt;
 StandardFormat=&lt;0|1&gt;
@@ -316,6 +317,9 @@ <h3>
       <li>
         <em>DelphiXE5</em> &ndash; Delphi XE5 compiler
       </li>
+      <li>
+        <em>DelphiXE6</em> &ndash; Delphi XE6 compiler
+      </li>
       <li>
         <em>FPC</em> &ndash; Free Pascal compiler
       </li>
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -556,6 +556,9 @@ <h3>
           <li>
             <em>dXE5</em> &ndash; Delphi XE5 compiler
           </li>
+          <li>
+            <em>dXE6</em> &ndash; Delphi XE6 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 v2 to XE5 along with Free
+with each installed Win32 version of Delphi from v2 to XE6 along with Free
 Pascal.
 
 Compilable Pascal units can be created that contain selected snippets.
@@ -225,8 +225,8 @@ dialogue" in the help file index).
 
 Each user can configure compilers differently.
 
-Delphi XE2 to XE5 may need to be configured to search for required units in the
-correct namespaces. This is explaned in the Add/Edit Snippet Dialogue Box help
+Delphi XE2 to XE6 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 http://delphidabbler.com/url/codesnip-and-xe2.
 
 
diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2006-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -137,6 +137,8 @@ function TBDSCompiler.GetIDString: string;
       Result := 'DXE4';
     ciDXE5:
       Result := 'DXE5';
+    ciDXE6:
+      Result := 'DXE6';
     else raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
   end;
 end;
@@ -149,6 +151,7 @@ function TBDSCompiler.GetName: string;
   sDelphiXE3 = 'Delphi XE3';    // name of Delphi XE3 compiler
   sDelphiXE4 = 'Delphi XE4';    // name of Delphi XE4 compiler
   sDelphiXE5 = 'Delphi XE5';    // name of Delphi XE5 compiler
+  sDelphiXE6 = 'Delphi XE6';    // name of Delphi XE6 compiler
 begin
   case GetID of
     ciDXE:
@@ -161,6 +164,8 @@ function TBDSCompiler.GetName: string;
       Result := sDelphiXE4;
     ciDXE5:
       Result := sDelphiXE5;
+    ciDXE6:
+      Result := sDelphiXE6;
     else
       Result := Format(sCompilerName, [ProductVersion]);
   end;
@@ -186,6 +191,7 @@ function TBDSCompiler.InstallationRegKey: string;
     ciDXE3    : Result := '\Software\Embarcadero\BDS\10.0';
     ciDXE4    : Result := '\Software\Embarcadero\BDS\11.0';
     ciDXE5    : Result := '\Software\Embarcadero\BDS\12.0';
+    ciDXE6    : Result := '\Software\Embarcadero\BDS\14.0';
     else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
   end;
 end;
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -38,6 +38,7 @@ interface
     ciDXE3,                             // Delphi XE3
     ciDXE4,                             // Delphi XE4
     ciDXE5,                             // Delphi XE5
+    ciDXE6,                             // Delphi XE6
     ciFPC                               // Free Pascal
   );
 
@@ -50,7 +51,7 @@ interface
   ///  compilers.</summary>
   cBDSCompilers = [
     ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
-    ciDXE3, ciDXE4, ciDXE5
+    ciDXE3, ciDXE4, ciDXE5, ciDXE6
   ];
 
 const
diff --git a/Src/DBIO.UIniDataReader.pas b/Src/DBIO.UIniDataReader.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -237,7 +237,7 @@ implementation
     'Delphi2', 'Delphi3', 'Delphi4', 'Delphi5', 'Delphi6', 'Delphi7',
     'Delphi2005Win32', 'Delphi2006Win32', 'Delphi2007', 'Delphi2009Win32',
     'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4',
-    'DelphiXE5', 'FPC'
+    'DelphiXE5', 'DelphiXE6', 'FPC'
   );
 
 { TIniDataReader }
diff --git a/Src/FirstRun.UConfigFile.pas b/Src/FirstRun.UConfigFile.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2007-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -479,6 +479,7 @@ procedure TUserConfigFileUpdater.UpdateNamespaces;
   UpdateForCompiler('DXE3');
   UpdateForCompiler('DXE4');
   UpdateForCompiler('DXE5');
+  UpdateForCompiler('DXE6');
 end;
 
 { TCommonConfigFileUpdater }
diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2010-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2010-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -677,6 +677,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
   AddMenuItem('Delphi XE3', 24.0);
   AddMenuItem('Delphi XE4', 25.0);
   AddMenuItem('Delphi XE5', 26.0);
+  AddMenuItem('Delphi XE6', 27.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
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -37,7 +37,7 @@ <h1>
     </p>
     <p>
       The supported compilers are the Win32 Delphi compilers from Delphi 2 to
-      Delphi XE5 and Free Pascal.
+      Delphi XE6 and Free Pascal.
     </p>
     <h2>
       Configuring CodeSnip
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2005-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -278,7 +278,7 @@ <h2>
     </h2>
     <p>
       <em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
-      compilers from versions 2 to XE5. Click the <em>Detect Delphi
+      compilers from versions 2 to XE6. 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
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2008-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -73,7 +73,7 @@ interface
   cCompilerIDs: array[TCompilerID] of string = (
     'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
     'd2005', 'd2006', 'd2007', 'd2009', 'd2010',
-    'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use}, 'dXE5',
+    'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use}, 'dXE5', 'dXE6',
     'fpc'
   );
 
diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 7, 245
-Product Version #=4, 8, 7, 0
+File Version #=4, 9, 0, 246
+Product Version #=4, 9, 0, 0
 File OS=4
 File Type=1
 File Sub-Type=0
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 7, 245
-Product Version #=4, 8, 7, 0
+File Version #=4, 9, 0, 246
+Product Version #=4, 9, 0, 0
 File OS=4
 File Type=1
 File Sub-Type=0
