paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-09 12:29:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: backup: do not store default subdirectry

Browse Source 
git-svn-id: trunk@51707 -
This commit is contained in:
mattias 2016-02-26 12:54:26 +00:00
parent 4b0ec4022f
commit f02782c7e0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/environmentopts.pp
View File

@ -98,10 +98,13 @@ type
SubDirectory: string; SubDirectory: string;
end; end;
const const
// Important: When changing any of these values increase EnvOptsVersion
// and add code to read old options
DefaultBackupTypeProject = bakSameName; DefaultBackupTypeProject = bakSameName;
DefaultBackupTypeOther = bakUserDefinedAddExt; DefaultBackupTypeOther = bakUserDefinedAddExt;
DefaultBackupAddExt = 'bak'; DefaultBackupAddExt = 'bak';
DefaultBackupMaxCounter = 9; DefaultBackupMaxCounter = 9;
DefaultBackupSubDirectory = 'backup';
{ Debugging } { Debugging }
@ -1390,13 +1393,13 @@ begin
BackupType:=DefaultBackupTypeProject; BackupType:=DefaultBackupTypeProject;
AdditionalExtension:=DefaultBackupAddExt; // for bakUserDefinedAddExt AdditionalExtension:=DefaultBackupAddExt; // for bakUserDefinedAddExt
MaxCounter:=DefaultBackupMaxCounter; // for bakCounter MaxCounter:=DefaultBackupMaxCounter; // for bakCounter
SubDirectory:=''; SubDirectory:=DefaultBackupSubDirectory;
end; end;
with FBackupInfoOtherFiles do begin with FBackupInfoOtherFiles do begin
BackupType:=DefaultBackupTypeOther; BackupType:=DefaultBackupTypeOther;
AdditionalExtension:=DefaultBackupAddExt; // for bakUserDefinedAddExt AdditionalExtension:=DefaultBackupAddExt; // for bakUserDefinedAddExt
MaxCounter:=DefaultBackupMaxCounter; // for bakCounter MaxCounter:=DefaultBackupMaxCounter; // for bakCounter
SubDirectory:=''; SubDirectory:=DefaultBackupSubDirectory;
end; end;
// external tools // external tools
@ -1556,11 +1559,11 @@ procedure TEnvironmentOptions.LoadNonDesktop(Path: String);
end; end;
end; end;
AdditionalExtension:=FXMLCfg.GetValue(Path+'AdditionalExtension',DefaultBackupAddExt); AdditionalExtension:=FXMLCfg.GetValue(Path+'AdditionalExtension',DefaultBackupAddExt);
MaxCounter:=FXMLCfg.GetValue(Path+'MaxCounter',DefaultBackupMaxCounter); MaxCounter:=FXMLCfg.GetValue(Path+'MaxCounter',9); // DefaultBackupMaxCounter
if FFileVersion<101 then if FFileVersion<101 then
SubDirectory:='' SubDirectory:=''
else else
SubDirectory:=FXMLCfg.GetValue(Path+'SubDirectory','backup'); SubDirectory:=FXMLCfg.GetValue(Path+'SubDirectory','backup'); // DefaultBackupSubDirectory;
end; end;
end; end;
@ -1913,7 +1916,7 @@ procedure TEnvironmentOptions.SaveNonDesktop(Path: String);
FXMLCfg.SetDeleteValue(Path+'Type',BackupTypeToName(BackupType),BackupTypeToName(DefaultBackupType)); FXMLCfg.SetDeleteValue(Path+'Type',BackupTypeToName(BackupType),BackupTypeToName(DefaultBackupType));
FXMLCfg.SetDeleteValue(Path+'AdditionalExtension',AdditionalExtension,DefaultBackupAddExt); FXMLCfg.SetDeleteValue(Path+'AdditionalExtension',AdditionalExtension,DefaultBackupAddExt);
FXMLCfg.SetDeleteValue(Path+'MaxCounter',MaxCounter,DefaultBackupMaxCounter); FXMLCfg.SetDeleteValue(Path+'MaxCounter',MaxCounter,DefaultBackupMaxCounter);
FXMLCfg.SetDeleteValue(Path+'SubDirectory',SubDirectory,'backup'); FXMLCfg.SetDeleteValue(Path+'SubDirectory',SubDirectory,DefaultBackupSubDirectory);
end; end;
end; end;