paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 07:59:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: clean up

Browse Source 
git-svn-id: trunk@53186 -
This commit is contained in:
mattias 2016-10-20 20:21:08 +00:00
parent 1a654e3c8b
commit a14da683e3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/lazbuild.lpr
View File

@ -255,7 +255,7 @@ begin
if DepOwner is TLazPackage then begin if DepOwner is TLazPackage then begin
Directory:=TLazPackage(DepOwner).Directory; Directory:=TLazPackage(DepOwner).Directory;
end else if DepOwner is TProject then begin end else if DepOwner is TProject then begin
Directory:=TProject(DepOwner).ProjectDirectory; Directory:=TProject(DepOwner).Directory;
end else begin end else begin
Directory:='' Directory:=''
end; end;
@ -328,7 +328,7 @@ begin
CodeToolBoss.SetGlobalValue(ExternalMacroStart+'ProjPath',VirtualDirectory) CodeToolBoss.SetGlobalValue(ExternalMacroStart+'ProjPath',VirtualDirectory)
else else
CodeToolBoss.SetGlobalValue(ExternalMacroStart+'ProjPath', CodeToolBoss.SetGlobalValue(ExternalMacroStart+'ProjPath',
Project1.ProjectDirectory) Project1.Directory)
end; end;
function TLazBuildApplication.OnIDEMessageDialog(const aCaption, aMsg: string; function TLazBuildApplication.OnIDEMessageDialog(const aCaption, aMsg: string;
@ -804,7 +804,7 @@ var
end; end;
end; end;
WorkingDir:=Project1.ProjectDirectory; WorkingDir:=Project1.Directory;
SrcFilename:=CreateRelativePath(Project1.MainUnitInfo.Filename,WorkingDir); SrcFilename:=CreateRelativePath(Project1.MainUnitInfo.Filename,WorkingDir);
NeedBuildAllFlag:=false; NeedBuildAllFlag:=false;
@ -818,7 +818,7 @@ var
ToolBefore:=TProjectCompilationToolOptions( ToolBefore:=TProjectCompilationToolOptions(
Project1.CompilerOptions.ExecuteBefore); Project1.CompilerOptions.ExecuteBefore);
if (CompReason in ToolBefore.CompileReasons) then begin if (CompReason in ToolBefore.CompileReasons) then begin
if ToolBefore.Execute(Project1.ProjectDirectory, if ToolBefore.Execute(Project1.Directory,
lisProject2+lisExecutingCommandBefore, CompileHint)<>mrOk lisProject2+lisExecutingCommandBefore, CompileHint)<>mrOk
then then
Error(ErrorBuildFailed,'failed "tool before" of project '+AFilename); Error(ErrorBuildFailed,'failed "tool before" of project '+AFilename);
@ -885,7 +885,7 @@ var
ToolAfter:=TProjectCompilationToolOptions( ToolAfter:=TProjectCompilationToolOptions(
Project1.CompilerOptions.ExecuteAfter); Project1.CompilerOptions.ExecuteAfter);
if (CompReason in ToolAfter.CompileReasons) then begin if (CompReason in ToolAfter.CompileReasons) then begin
if ToolAfter.Execute(Project1.ProjectDirectory, if ToolAfter.Execute(Project1.Directory,
lisProject2+lisExecutingCommandAfter,CompileHint)<>mrOk lisProject2+lisExecutingCommandAfter,CompileHint)<>mrOk
then then
Error(ErrorBuildFailed,'failed "tool after" of project '+AFilename); Error(ErrorBuildFailed,'failed "tool after" of project '+AFilename);