Add conditional compilation for how common config file is processed with different program editions

Standard version performs as before, but portable version simply deletes common config file if present.

Author: delphidabbler

Src/FirstRun.UConfigFile.pas

@@ -130,15 +130,26 @@   TCommonConfigFileUpdater = class(TConfigFileUpdater)
   public
     ///  <summary>Stamps config file with current program and file versions.
     ///  </summary>
-    ///  <remarks>Note that the user config file has program version written to
+    ///  <remarks>
+    ///  <para>Note that the user config file has program version written to
     ///  a different section to common config file, hence need for overridden
-    ///  methods.</remarks>
+    ///  methods.</para>
+    ///  <para>Does nothing in portable edition.</para>
+    ///  </remarks>
     procedure Stamp; override;
+   {$IFNDEF PORTABLE}
     ///  <summary>Deletes program registration information from application
     ///  section.</summary>
+    ///  <remarks>Standard edition only.</remarks>
     procedure DeleteRegistrationInfo;
     ///  <summary>Deletes program key from application section.</summary>
+    ///  <remarks>Standard edition only.</remarks>
     procedure DeleteProgramKey;
+    {$ELSE}
+    ///  <summary>Deletes and common config file</summary>
+    ///  <remarks>Portable edition only</remarks>
+    procedure DeleteCfgFile;
+    {$ENDIF}
   end;
 
 
@@ -488,20 +499,32 @@ procedure TUserConfigFileUpdater.UpdateNamespaces;
 
 { TCommonConfigFileUpdater }
 
+{$IFDEF PORTABLE}
+procedure TCommonConfigFileUpdater.DeleteCfgFile;
+begin
+  if TFile.Exists(CfgFileName, False) then
+    TFile.Delete(CfgFileName);
+end;
+{$ENDIF}
+
+{$IFNDEF PORTABLE}
 procedure TCommonConfigFileUpdater.DeleteProgramKey;
 begin
   if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   DeleteIniKey('Application', 'Key', CfgFileName);
 end;
+{$ENDIF}
 
+{$IFNDEF PORTABLE}
 procedure TCommonConfigFileUpdater.DeleteRegistrationInfo;
 begin
   if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
   DeleteIniKey('Application', 'RegCode', CfgFileName);
   DeleteIniKey('Application', 'RegName', CfgFileName);
 end;
+{$ENDIF}
 
 class function TCommonConfigFileUpdater.GetFileVersion: Integer;
 begin
@@ -510,10 +533,12 @@ class function TCommonConfigFileUpdater.GetFileVersion: Integer;
 
 procedure TCommonConfigFileUpdater.Stamp;
 begin
+  {$IFNDEF PORTABLE}
   inherited;
   SetIniString(
     'Application', 'Version', TAppInfo.ProgramReleaseVersion, CfgFileName
   );
+  {$ENDIF}
 end;
 
 end.

Src/FirstRun.UMain.pas

@@ -246,15 +246,22 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
 
   if fCommonConfigFile.FileVer < 7 then
   begin
+    {$IFNDEF PORTABLE}
     fCommonConfigFile.DeleteRegistrationInfo;
     fCommonConfigFile.DeleteProgramKey;
+    {$ENDIF}
   end;
 
   fUserConfigFile.Stamp;
+
+  {$IFNDEF PORTABLE}
   // NOTE: strictly speaking we only need to stamp common config file in
   // portable version. Installer does this in normal version. However, it does
   // no harm to stamp this file twice - belt and braces!
   fCommonConfigFile.Stamp;
+  {$ELSE}
+  fCommonConfigFile.DeleteCfgFile;
+  {$ENDIF}
 end;
 
 { TFirstRunMgr }