diff --git a/ide/basebuildmanager.pas b/ide/basebuildmanager.pas index e0d1848062..d1d8b5cfbe 100644 --- a/ide/basebuildmanager.pas +++ b/ide/basebuildmanager.pas @@ -79,7 +79,7 @@ type ): TModalResult; virtual; abstract; function CreateProjectApplicationBundle: Boolean; virtual; abstract; - function BackupFile(const Filename: string): TModalResult; virtual; abstract; + function BackupFileForWrite(const Filename: string): TModalResult; virtual; abstract; function UpdateProjectAutomaticFiles(TestDir: string): TModalResult; virtual; abstract; end; diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas index b74b7aecc9..4e307cda78 100644 --- a/ide/buildmanager.pas +++ b/ide/buildmanager.pas @@ -214,7 +214,7 @@ type CompiledExt, ContextDescription: string ): TModalResult; override; function CreateProjectApplicationBundle: Boolean; override; - function BackupFile(const Filename: string): TModalResult; override; + function BackupFileForWrite(const Filename: string): TModalResult; override; function GetResourceType(AnUnitInfo: TUnitInfo): TResourceType; function FindLRSFilename(AnUnitInfo: TUnitInfo; @@ -328,7 +328,7 @@ begin fLCLWidgetType:=LCLPlatformDirNames[GetDefaultLCLWidgetType]; FUnitSetChangeStamp:=TFPCUnitSetCache.GetInvalidChangeStamp; - OnBackupFileInteractive:=@BackupFile; + OnBackupFileInteractive:=@BackupFileForWrite; GetBuildMacroValues:=@OnGetBuildMacroValues; OnAppendCustomOption:=@AppendMatrixCustomOption; @@ -1474,7 +1474,7 @@ begin if not (Result in [mrOK,mrIgnore]) then exit(mrCancel); end else if EnvironmentOptions.AmbiguousFileAction=afaAutoRename then begin - Result:=BackupFile(CurFilename); + Result:=BackupFileForWrite(CurFilename); if not (Result in [mrOK,mrIgnore]) then exit(mrCancel); if FileExistsUTF8(CurFilename) then begin Result:=DeleteFileInteractive(CurFilename); @@ -1625,7 +1625,7 @@ begin Result := True; end; -function TBuildManager.BackupFile(const Filename: string): TModalResult; +function TBuildManager.BackupFileForWrite(const Filename: string): TModalResult; var BackupFilename, CounterFilename: string; AText,ACaption:string; BackupInfo: TBackupInfo; @@ -1752,7 +1752,7 @@ begin end; // backup file repeat - if not IDEProcs.BackupFile(Filename, BackupFilename) then + if not IDEProcs.BackupFileForWrite(Filename, BackupFilename) then begin ACaption := lisBackupFileFailed; AText := Format(lisUnableToBackupFileTo, [Filename, BackupFilename]); diff --git a/ide/ideprocs.pp b/ide/ideprocs.pp index 5a3c77d545..75a8bb198a 100644 --- a/ide/ideprocs.pp +++ b/ide/ideprocs.pp @@ -76,7 +76,7 @@ type Data: TObject) of object; // file operations -function BackupFile(const Filename, BackupFilename: string): boolean; +function BackupFileForWrite(const Filename, BackupFilename: string): boolean; function ClearFile(const Filename: string; RaiseOnError: boolean): boolean; function CreateEmptyFile(const Filename: string): boolean; function CopyFileWithMethods(const SrcFilename, DestFilename: string; @@ -1401,7 +1401,7 @@ begin end; {------------------------------------------------------------------------------- - BackupFile + BackupFileForWrite Params: const Filename, BackupFilename: string Result: boolean @@ -1409,7 +1409,7 @@ end; Rename Filename to Backupfilename and create empty Filename with same file attributes -------------------------------------------------------------------------------} -function BackupFile(const Filename, BackupFilename: string): boolean; +function BackupFileForWrite(const Filename, BackupFilename: string): boolean; function FileIsLocked(const {%H-}FileName: String): Boolean; {$ifdef Windows} diff --git a/ide/lazbuild.lpi b/ide/lazbuild.lpi index 37bf324007..af8e3da0f2 100644 --- a/ide/lazbuild.lpi +++ b/ide/lazbuild.lpi @@ -57,6 +57,7 @@ + diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr index 96787b3bfe..d497a37f44 100644 --- a/ide/lazbuild.lpr +++ b/ide/lazbuild.lpr @@ -995,7 +995,7 @@ begin Result.EndUpdate; Result.MainProject:=true; - Result.OnFileBackup:=@BuildBoss.BackupFile; + Result.OnFileBackup:=@BuildBoss.BackupFileForWrite; Result.OnChangeProjectInfoFile:=@OnProjectChangeInfoFile; finally diff --git a/ide/main.pp b/ide/main.pp index 59c782811f..7cc95717e6 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -6063,7 +6063,6 @@ begin Result.EndUpdate; Result.MainProject:=true; - Result.OnFileBackup:=@MainBuildBoss.BackupFile; Result.OnLoadProjectInfo:=@OnLoadProjectInfoFromXMLConfig; Result.OnSaveProjectInfo:=@OnSaveProjectInfoToXMLConfig; Result.OnSaveUnitSessionInfo:=@OnSaveProjectUnitSessionInfo; diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas index 6b25788878..3ee948bdb6 100644 --- a/packager/pkgmanager.pas +++ b/packager/pkgmanager.pas @@ -3752,7 +3752,7 @@ begin end; // backup old file - Result:=BuildBoss.BackupFile(APackage.Filename); + Result:=BuildBoss.BackupFileForWrite(APackage.Filename); if Result=mrAbort then exit; // delete ambiguous files