paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 10:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: writing package compiled state even on unsuccessful compile, bug #16921

Browse Source 
git-svn-id: trunk@26629 -
This commit is contained in:
mattias 2010-07-13 16:02:40 +00:00
parent 10bd683ca8
commit 60eb949386
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packager/packagedefs.pas
View File

@ -555,6 +555,7 @@ type
FHoldPackageCount: integer;
FIconFile: string;
FInstalled: TPackageInstallType;
FLastCompileComplete: boolean;
FLastCompilerFileDate: integer;
FLastCompilerFilename: string;
FLastCompilerParams: string;
@ -766,6 +767,8 @@ type
write FLastCompilerFilename;
property LastCompilerParams: string read FLastCompilerParams
write FLastCompilerParams;
property LastCompileComplete: boolean read FLastCompileComplete
write FLastCompileComplete;
property LazDocPaths: string read FLazDocPaths write SetLazDocPaths;
property License: string read FLicense write SetLicense;
property LPKSource: TCodeBuffer read FLPKSource write SetLPKSource;// can be nil when file on disk was removed

39
packager/packagesystem.pas
View File

@ -267,7 +267,8 @@ type
const NewName: string; NewVersion: TPkgVersion;
RenameDependencies: boolean);
function SavePackageCompiledState(APackage: TLazPackage;
const CompilerFilename, CompilerParams: string): TModalResult;
const CompilerFilename, CompilerParams: string;
Complete: boolean): TModalResult;
function LoadPackageCompiledState(APackage: TLazPackage;
IgnoreErrors: boolean): TModalResult;
function CheckCompileNeedDueToDependencies(FirstDependency: TPkgDependency;
@ -2701,7 +2702,8 @@ begin
end;
function TLazPackageGraph.SavePackageCompiledState(APackage: TLazPackage;
const CompilerFilename, CompilerParams: string): TModalResult;
const CompilerFilename, CompilerParams: string; Complete: boolean
): TModalResult;
var
XMLConfig: TXMLConfig;
StateFile: String;
@ -2710,20 +2712,24 @@ begin
Result:=mrCancel;
StateFile:=APackage.GetStateFilename;
try
CompilerFileDate:=FileAgeUTF8(CompilerFilename);
CompilerFileDate:=FileAgeCached(CompilerFilename);
APackage.LastCompilerFilename:=CompilerFilename;
APackage.LastCompilerFileDate:=CompilerFileDate;
APackage.LastCompilerParams:=CompilerParams;
APackage.LastCompileComplete:=Complete;
XMLConfig:=TXMLConfig.CreateClean(StateFile);
try
XMLConfig.SetValue('Compiler/Value',CompilerFilename);
XMLConfig.SetValue('Compiler/Date',CompilerFileDate);
XMLConfig.SetValue('Params/Value',CompilerParams);
XMLConfig.SetDeleteValue('Complete/Value',Complete,true);
InvalidateFileStateCache;
XMLConfig.Flush;
finally
XMLConfig.Free;
end;
APackage.LastCompilerFilename:=CompilerFilename;
APackage.LastCompilerFileDate:=CompilerFileDate;
APackage.LastCompilerParams:=CompilerParams;
APackage.LastStateFileName:=StateFile;
APackage.LastStateFileDate:=FileAgeUTF8(StateFile);
APackage.Flags:=APackage.Flags+[lpfStateFileLoaded];
@ -2767,6 +2773,7 @@ begin
APackage.LastCompilerFilename:=XMLConfig.GetValue('Compiler/Value','');
APackage.LastCompilerFileDate:=XMLConfig.GetValue('Compiler/Date',0);
APackage.LastCompilerParams:=XMLConfig.GetValue('Params/Value','');
APackage.LastCompileComplete:=XMLConfig.GetValue('Complete/Value',true);
finally
XMLConfig.Free;
end;
@ -2976,6 +2983,12 @@ begin
// quick compile is possible
NeedBuildAllFlag:=false;
if not APackage.LastCompileComplete
then begin
DebugLn('TLazPackageGraph.CheckIfPackageNeedsCompilation Compile was incomplete for ',APackage.IDAsString);
exit(mrYes);
end;
// check all required packages
Result:=CheckCompileNeedDueToDependencies(APackage.FirstRequiredDependency,
StateFileAge);
@ -3047,6 +3060,7 @@ var
CompilePolicies: TPackageUpdatePolicies;
BlockBegan: Boolean;
NeedBuildAllFlag: Boolean;
CompileResult: TModalResult;
begin
Result:=mrCancel;
@ -3189,18 +3203,17 @@ begin
SourceEditorManagerIntf.ClearErrorLines;
// compile package
Result:=RunCompilerWithOptions(PkgCompileTool,APackage.CompilerOptions);
if Result<>mrOk then exit;
// compilation succeded -> write state file
CompileResult:=RunCompilerWithOptions(PkgCompileTool,APackage.CompilerOptions);
// write state file
Result:=SavePackageCompiledState(APackage,
CompilerFilename,CompilerParams);
CompilerFilename,CompilerParams,
CompileResult=mrOk);
if Result<>mrOk then begin
APackage.LastCompilerFilename:=CompilerFilename;
APackage.LastCompilerParams:=CompilerParams;
APackage.LastCompilerFileDate:=FileAgeUTF8(CompilerFilename);
DebugLn(['TLazPackageGraph.CompilePackage SavePackageCompiledState failed: ',APackage.IDAsString]);
exit;
end;
Result:=CompileResult;
if Result<>mrOk then exit;
finally
// clean up
PkgCompileTool.Free;