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

IDE: fixed typo, less verbose

Browse Source 
git-svn-id: trunk@38591 -
This commit is contained in:
mattias 2012-09-09 08:52:22 +00:00
parent b08d33069e
commit 1f2f2e3527
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ide/buildmanager.pas
View File

@ -1017,7 +1017,7 @@ begin
end; end;
// compiler and parameters are the same // compiler and parameters are the same
// quick compile is possible // => it is possible to quick compile without -B
NeedBuildAllFlag:=false; NeedBuildAllFlag:=false;
if not AProject.LastCompileComplete then begin if not AProject.LastCompileComplete then begin
@ -1080,6 +1080,9 @@ begin
AnUnitInfo:=AnUnitInfo.NextUnitWithEditorIndex; AnUnitInfo:=AnUnitInfo.NextUnitWithEditorIndex;
end; end;
// check project resources
// ToDo
Result:=mrNo; Result:=mrNo;
end; end;

2
ide/lazarusidestrconsts.pas
View File

@ -834,7 +834,7 @@ resourcestring
lisInfoBuildWarning = 'Warnings:'; lisInfoBuildWarning = 'Warnings:';
lisInfoBuildProject = 'Project:'; lisInfoBuildProject = 'Project:';
listInfoBuildCompiling = 'Compiling:'; listInfoBuildCompiling = 'Compiling:';
lisInfoBuildComplile = 'Compiling ...'; lisInfoBuildCompile = 'Compiling ...';
lisFPCTooOld = 'FPC too old'; lisFPCTooOld = 'FPC too old';
lisTheProjectUsesTheNewFPCResourcesWhichRequiresAtLea = 'The project uses ' lisTheProjectUsesTheNewFPCResourcesWhichRequiresAtLea = 'The project uses '
+'the new FPC resources, which requires at least FPC 2.4'; +'the new FPC resources, which requires at least FPC 2.4';

21
ide/main.pp
View File

@ -12294,7 +12294,7 @@ begin
end; end;
end; end;
CompileProgress.CreateDialog(OwningComponent, Project1.MainFilename, lisInfoBuildComplile); CompileProgress.CreateDialog(OwningComponent, Project1.MainFilename, lisInfoBuildCompile);
// clear old error lines // clear old error lines
SourceEditorManager.ClearErrorLines; SourceEditorManager.ClearErrorLines;
@ -12570,15 +12570,24 @@ begin
Result := mrCancel; Result := mrCancel;
// Check if we can run this project // Check if this project is runnable
debugln('TMainIDE.DoInitProjectRun Check if project can run: ',dbgs(pfRunnable in Project1.Flags),' ',dbgs(Project1.MainUnitID));
if not ( ((Project1.CompilerOptions.ExecutableType=cetProgram) or if not ( ((Project1.CompilerOptions.ExecutableType=cetProgram) or
(Project1.RunParameterOptions.HostApplicationFilename<>'')) (Project1.RunParameterOptions.HostApplicationFilename<>''))
and (pfRunnable in Project1.Flags) and (Project1.MainUnitID >= 0) ) then Exit; and (pfRunnable in Project1.Flags) and (Project1.MainUnitID >= 0) )
then begin
debugln(['TMainIDE.DoInitProjectRun Project can not run:',
' pfRunnable=',pfRunnable in Project1.Flags,
' MainUnitID=',Project1.MainUnitID,
' Launchable=',(Project1.CompilerOptions.ExecutableType=cetProgram) or
(Project1.RunParameterOptions.HostApplicationFilename<>'')
]);
Exit;
end;
debugln('TMainIDE.DoInitProjectRun Check build ...');
// Build project first // Build project first
if DoBuildProject(crRun,[pbfOnlyIfNeeded]) <> mrOk then Exit; debugln('TMainIDE.DoInitProjectRun Check build ...');
if DoBuildProject(crRun,[pbfOnlyIfNeeded]) <> mrOk then
Exit;
// Check project build // Check project build
ProgramFilename := MainBuildBoss.GetProjectTargetFilename(Project1); ProgramFilename := MainBuildBoss.GetProjectTargetFilename(Project1);