Merged revision(s) 4003-4493, 3462-4003 from tags/version-4.8.5:

delphidabbler · delphidabbler · commit 67dbf9546ad2 · 2014-01-13T17:09:17.000Z
This updates the trunk with changes made in release 4.8.5.
diff --git a/Docs/ChangeLogs/ChangeLog-v4.txt b/Docs/ChangeLogs/ChangeLog-v4.txt
@@ -3,14 +3,19 @@
 ; 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$
 ;
 ; Change Log for CodeSnip Release 4
 ; ------------------------------------------------------------------------------
 
+Release v4.8.5 of 13 January 2014
++ Fixed bug #91 "Generated units won't compile on Delphi XE5" (http://bit.ly/1eBjym2). Compiler directives that are used to change compiler warnings now includes a conditionally compiled $LEGACYIFEND ON directive.
++ Fixed potential bug when checking for the existence of files. It had been possible that a "sym-link" to a file could give misleading results.
++ Updated program copyright date in license file, about box, help file and installer.
+
 Release v4.8.4 of 28 November 2013
 + Improved user interface of SWAG Import Wizard.
 + Renamed "Save Snippet" and "Copy Snippet" menu options to "Save Annotated Source" and "Copy Annotated Source". This fixes bug #90: " Wrong caption on menu option for copying category to clipboard" (http://bit.ly/ImA398).
diff --git a/Docs/LICENSE b/Docs/LICENSE
@@ -5,4 +5,4 @@ This Source Code Form is subject to the terms of the Mozilla Public
 License, 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/.
 
-All files are copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+All files are copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
diff --git a/Docs/License.html b/Docs/License.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$
@@ -228,7 +228,7 @@ <h2>
     Executable Program
   </h2>
   <p>
-    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2013 by Peter D
+    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2014 by Peter D
     Johnson, <a
       href="http://www.delphidabbler.com"
     >http://www.delphidabbler.com</a>.
diff --git a/Src/Favourites.UPersist.pas b/Src/Favourites.UPersist.pas
@@ -79,7 +79,7 @@ class procedure TFavouritesPersist.Load(Favourites: TFavourites);
 resourcestring
   sBadFormat = 'Invalid favourites file format';
 begin
-  if not TFile.Exists(FavouritesFileName) then
+  if not TFile.Exists(FavouritesFileName, False) then
     Exit;
   try
     Lines := TIStringList.Create(
diff --git a/Src/FirstRun.UConfigFile.pas b/Src/FirstRun.UConfigFile.pas
@@ -219,7 +219,7 @@ class function TConfigFileUpdater.IsCurrentProgramVer(
 
 procedure TConfigFileUpdater.Stamp;
 begin
-  if not TFile.Exists(fCfgFileName) then
+  if not TFile.Exists(fCfgFileName, False) then
     CreateNewFile;
   SetIniInt('IniFile', 'Version', GetFileVersion, fCfgFileName);
 end;
@@ -228,7 +228,7 @@ procedure TConfigFileUpdater.Stamp;
 
 procedure TUserConfigFileUpdater.CreateDefaultCodeGenEntries;
 begin
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   SetIniInt('Prefs:CodeGen', 'EmitWarnDirs', 0, CfgFileName);
   SetIniInt('Prefs:CodeGen', 'WarningCount', 8, CfgFileName);
@@ -270,7 +270,7 @@ procedure TUserConfigFileUpdater.CreateDefaultCodeGenEntries;
 {$IFNDEF PORTABLE}
 procedure TUserConfigFileUpdater.DeleteDetailsPaneIndex;
 begin
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   DeleteIniKey('MainWindow', 'DetailTab', CfgFileName);
 end;
@@ -279,7 +279,7 @@ procedure TUserConfigFileUpdater.DeleteDetailsPaneIndex;
 {$IFNDEF PORTABLE}
 procedure TUserConfigFileUpdater.DeleteHighligherPrefs;
 begin
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   DeleteIniSection('Prefs:Hiliter', CfgFileName);
 end;
@@ -288,7 +288,7 @@ procedure TUserConfigFileUpdater.DeleteHighligherPrefs;
 {$IFNDEF PORTABLE}
 procedure TUserConfigFileUpdater.DeleteProxyPassword;
 begin
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   SetIniString('ProxyServer', 'Password', '', CfgFileName);
 end;
@@ -308,7 +308,7 @@ function TUserConfigFileUpdater.HasProxyPassword: Boolean;
 
 procedure TUserConfigFileUpdater.RenameMainWindowSection;
 begin
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     Exit;
   if not IniSectionExists('MainWindow', CfgFileName) then
     Exit;
@@ -370,7 +370,7 @@ procedure TUserConfigFileUpdater.UpdateCodeGenEntries;
 begin
   // Key that determines if warnings are emitted changes from SwitchOffWarnings
   // to EmitWarnDirs.
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   if IniKeyExists('Prefs:CodeGen', 'SwitchOffWarnings', CfgFileName) then
   begin
@@ -410,7 +410,7 @@ procedure TUserConfigFileUpdater.UpdateFromOriginal;
 var
   I: Integer; // loops thru all highlight elements
 begin
-  if not TFile.Exists(CfgFileName) then
+  if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   // Delete unwanted sections:
   // - Application section: now in common config file
diff --git a/Src/FirstRun.UInstallInfo.pas b/Src/FirstRun.UInstallInfo.pas
@@ -196,17 +196,21 @@ procedure TInstallInfo.DetectInstall;
   end;
 
 begin
-  if TFile.Exists(MakeFullUserPath(UserConfigFileNames[piV4])) and not
+  if TFile.Exists(MakeFullUserPath(UserConfigFileNames[piV4]), False) and not
     IsEmptyUnicodeCfgFile(MakeFullUserPath(UserConfigFileNames[piV4])) then
     fInstallID := piV4
   {$IFNDEF PORTABLE}
-  else if TFile.Exists(MakeFullUserPath(UserConfigFileNames[piV3])) then
+  else if TFile.Exists(MakeFullUserPath(UserConfigFileNames[piV3]), False) then
     fInstallID := piV3
   else if TDirectory.Exists(MakeFullUserPath(DatabaseDirs[piV2])) then
     fInstallID := piV2
-  else if TFile.Exists(MakeFullUserPath(UserConfigFileNames[piV1_9])) then
+  else if TFile.Exists(
+    MakeFullUserPath(UserConfigFileNames[piV1_9]), False
+  ) then
     fInstallID := piV1_9
-  else if TFile.Exists(MakeFullUserPath(UserConfigFileNames[piOriginal])) then
+  else if TFile.Exists(
+    MakeFullUserPath(UserConfigFileNames[piOriginal]), False
+  ) then
     fInstallID := piOriginal
   {$ENDIF}
   else
diff --git a/Src/FirstRun.UMain.pas b/Src/FirstRun.UMain.pas
@@ -196,12 +196,12 @@ function TFirstRun.HasOldStyleProxyPwd: Boolean;
 
 function TFirstRun.HaveOldUserCfgFile: Boolean;
 begin
-  Result := TFile.Exists(fInstallInfo.PreviousUserConfigFileName);
+  Result := TFile.Exists(fInstallInfo.PreviousUserConfigFileName, False);
 end;
 
 function TFirstRun.HaveOldUserDB: Boolean;
 begin
-  Result := TFile.Exists(fInstallInfo.PreviousUserDatabaseFileName);
+  Result := TFile.Exists(fInstallInfo.PreviousUserDatabaseFileName, False);
 end;
 
 function TFirstRun.IsProgramUpdated: Boolean;
@@ -318,7 +318,7 @@ class function TFirstRunMgr.IsProgramUpdated: Boolean;
 
 class function TFirstRunMgr.UserCfgFileExists: Boolean;
 begin
-  Result := TFile.Exists(TInstallInfo.CurrentUserConfigFileName);
+  Result := TFile.Exists(TInstallInfo.CurrentUserConfigFileName, False);
 end;
 
 end.
diff --git a/Src/Help/HTML/license.htm b/Src/Help/HTML/license.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) 2012-2013, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
  *
  * $Rev$
  * $Date$
@@ -30,7 +30,7 @@ <h1>
       <a name="license"></a>Summary of End User License Agreement
     </h1>
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2013 by Peter D
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2014 by Peter D
       Johnson, <a
         href="http://delphidabbler.com"
         class="weblink"
diff --git a/Src/Install/Assets/LICENSE b/Src/Install/Assets/LICENSE
@@ -5,4 +5,4 @@ This Source Code Form is subject to the terms of the Mozilla Public
 License, 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/.
 
-All files are copyright (C) 2012-2013, Peter Johnson (www.delphidabbler.com).
+All files are copyright (C) 2012-2014, Peter Johnson (www.delphidabbler.com).
diff --git a/Src/Install/Assets/License.rtf b/Src/Install/Assets/License.rtf
diff --git a/Src/Res/HTML/dlg-about-program-tplt.html b/Src/Res/HTML/dlg-about-program-tplt.html
@@ -9,7 +9,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$
@@ -50,7 +50,7 @@
   <body>
 
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2013 by Peter D
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2014 by Peter D
       Johnson, <a
         class="external-link"
         href="http://delphidabbler.com"
diff --git a/Src/USettings.pas b/Src/USettings.pas
@@ -584,7 +584,7 @@ function TIniSettingsBase.CreateIniFile(
   FileName: string; // name if ini file
 begin
   FileName := StorageName(Storage);
-  if not TFile.Exists(FileName) then
+  if not TFile.Exists(FileName, False) then
     // create empty Unicode text file with BOM to force Win API to write Unicode
     TFileIO.WriteAllText(FileName, '', TEncoding.Unicode, True);
   Result := TIniFile.Create(FileName);
diff --git a/Src/UWarnings.pas b/Src/UWarnings.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$
@@ -217,7 +217,7 @@ implementation
   // Delphi
   SysUtils, Generics.Defaults, Math,
   // Project
-  UConsts, UExceptions, UStrUtils;
+  UExceptions, UStrUtils;
 
 
 { TWarning }
@@ -355,6 +355,10 @@ function TWarnings.IsEmpty: Boolean;
 end;
 
 function TWarnings.Render: string;
+const
+  // Version number of Delphi XE3 compiler: this is the first version that
+  // supports the $LEGACYIFEND directive.
+  DelphiXE3Compiler = 24.0;
 var
   SB: TStringBuilder;           // used to construct source code string
   W: TWarning;                  // each warning in list
@@ -392,33 +396,43 @@ function TWarnings.Render: string;
     try
       SB.AppendLine('{$IFNDEF FPC}');
       SB.AppendLine('  {$IFDEF CONDITIONALEXPRESSIONS}');
+      // Write directives to ensure $IFEND directives are valid: uses
+      // $LEGACYIFEND directive supported from Delphi XE3 that is switched on by
+      // default in XE3 and XE4 but off by default in XE5. $LEGACYIFEND must
+      // be placed before the first $IFEND statement.
+      SB.AppendFormat('    {$IF CompilerVersion >= %.2f}', [DelphiXE3Compiler]);
+      SB.AppendLine;
+      SB.AppendLine('      {$LEGACYIFEND ON}');
+      SB.AppendLine('    {$IFEND}');
       for W in SortedList do
       begin
         if not Math.SameValue(W.MinCompiler, CurrentVer) then
         begin
-          // required compiler version has changed
+          // Required compiler version has changed
           if InsideVer then
           begin
-            // we were writing warnings for previous version: close statement
+            // We were writing warnings for previous version: close statement
             SB.AppendLine('    {$IFEND}');
             InsideVer := False;
           end;
-          // create new condition for new version
+          // Create new condition for new version
           SB.AppendFormat(
-            '    {$IF CompilerVersion >= %.2f}' + EOL, [W.MinCompiler]
+            '    {$IF CompilerVersion >= %.2f}', [W.MinCompiler]
           );
+          SB.AppendLine;
           InsideVer := True;
           CurrentVer := W.MinCompiler;
         end;
-        // write directive to turn warning off
+        // Write directive to turn warning off
         SB.AppendFormat(
-          '      {$WARN %0:s %1:s}' + EOL, [W.Symbol, StateStrings[W.State]]
+          '      {$WARN %0:s %1:s}', [W.Symbol, StateStrings[W.State]]
         );
+        SB.AppendLine;
       end;
-      // close off any open conditional statement
+      // Close off any open conditional statement
       if InsideVer then
         SB.AppendLine('    {$IFEND}');
-      // close bounding $IFDEFs
+      // Close bounding $IFDEFs
       SB.AppendLine('  {$ENDIF}');
       SB.AppendLine('{$ENDIF}');
       Result := SB.ToString;
diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
@@ -2,7 +2,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$
@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 4, 242
-Product Version #=4, 8, 4, 0
+File Version #=4, 8, 5, 243
+Product Version #=4, 8, 5, 0
 File OS=4
 File Type=1
 File Sub-Type=0
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
@@ -2,7 +2,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$
@@ -11,8 +11,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 8, 4, 242
-Product Version #=4, 8, 4, 0
+File Version #=4, 8, 5, 243
+Product Version #=4, 8, 5, 0
 File OS=4
 File Type=1
 File Sub-Type=0
