paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-30 15:58:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: fixed compilation

Browse Source 
git-svn-id: trunk@28933 -
This commit is contained in:
mattias 2011-01-10 13:29:22 +00:00
parent a8b437d1a0
commit c2f59b31e3
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/lazbuild.lpr
View File

@ -67,8 +67,6 @@ type
out Description: string); out Description: string);
procedure GetDependencyOwnerDirectory(Dependency: TPkgDependency; procedure GetDependencyOwnerDirectory(Dependency: TPkgDependency;
out Directory: string); out Directory: string);
procedure GetWritablePkgOutputDirectory(APackage: TLazPackage;
var AnOutDirectory: string);
// package graph // package graph
procedure PackageGraphAddPackage(Pkg: TLazPackage); procedure PackageGraphAddPackage(Pkg: TLazPackage);
@ -217,28 +215,6 @@ begin
GetDirectoryOfDependencyOwner(Dependency,Directory); GetDirectoryOfDependencyOwner(Dependency,Directory);
end; end;
procedure TLazBuildApplication.GetWritablePkgOutputDirectory(
APackage: TLazPackage; var AnOutDirectory: string);
var
NewOutDir: String;
begin
if DirectoryIsWritableCached(AnOutDirectory) then exit;
ForceDirectory(AnOutDirectory);
InvalidateFileStateCache;
if DirectoryIsWritableCached(AnOutDirectory) then exit;
//debugln('TPkgManager.GetWritablePkgOutputDirectory AnOutDirectory=',AnOutDirectory,' ',dbgs(DirectoryIsWritable(AnOutDirectory)));
// output directory is not writable
// -> redirect to config directory
NewOutDir:=SetDirSeparators('/$(TargetCPU)-$(TargetOS)');
IDEMacros.SubstituteMacros(NewOutDir);
NewOutDir:=TrimFilename(GetPrimaryConfigPath+PathDelim+'lib'+PathDelim
+APackage.Name+NewOutDir);
AnOutDirectory:=NewOutDir;
//debugln('TPkgManager.GetWritablePkgOutputDirectory APackage=',APackage.IDAsString,' AnOutDirectory="',AnOutDirectory,'"');
end;
procedure TLazBuildApplication.PackageGraphAddPackage(Pkg: TLazPackage); procedure TLazBuildApplication.PackageGraphAddPackage(Pkg: TLazPackage);
begin begin
if FileExists(Pkg.FileName) then PkgLinks.AddUserLink(Pkg); if FileExists(Pkg.FileName) then PkgLinks.AddUserLink(Pkg);
@ -850,7 +826,6 @@ procedure TLazBuildApplication.SetupPackageSystem;
begin begin
OnGetDependencyOwnerDescription:=@GetDependencyOwnerDescription; OnGetDependencyOwnerDescription:=@GetDependencyOwnerDescription;
OnGetDependencyOwnerDirectory:=@GetDependencyOwnerDirectory; OnGetDependencyOwnerDirectory:=@GetDependencyOwnerDirectory;
OnGetWritablePkgOutputDirectory:=@GetWritablePkgOutputDirectory;
// package links // package links
PkgLinks:=TPackageLinks.Create; PkgLinks:=TPackageLinks.Create;

2
ide/msgquickfixes.pas
View File

@ -259,7 +259,7 @@ begin
RegisterIDEMsgQuickFix(TQuickFixIdentifierNotFoundAddLocal.Create); RegisterIDEMsgQuickFix(TQuickFixIdentifierNotFoundAddLocal.Create);
RegisterIDEMsgQuickFix(TQuickFixLocalVariableNotUsed_Remove.Create); RegisterIDEMsgQuickFix(TQuickFixLocalVariableNotUsed_Remove.Create);
RegisterIDEMsgQuickFix(TQuickFixHint_Hide.Create); RegisterIDEMsgQuickFix(TQuickFixHint_Hide.Create);
//RegisterIDEMsgQuickFix(TQuickFixRecompilingChecksumChanged.Create); RegisterIDEMsgQuickFix(TQuickFixRecompilingChecksumChanged.Create);
end; end;
procedure FreeStandardIDEQuickFixItems; procedure FreeStandardIDEQuickFixItems;