From 1f2f2e3527597ea25b23591cec7ae4c2df49d0a4 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 9 Sep 2012 08:52:22 +0000 Subject: [PATCH] IDE: fixed typo, less verbose git-svn-id: trunk@38591 - --- ide/buildmanager.pas | 5 ++++- ide/lazarusidestrconsts.pas | 2 +- ide/main.pp | 21 +++++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas index dc02d5176d..a4fee85347 100644 --- a/ide/buildmanager.pas +++ b/ide/buildmanager.pas @@ -1017,7 +1017,7 @@ begin end; // compiler and parameters are the same - // quick compile is possible + // => it is possible to quick compile without -B NeedBuildAllFlag:=false; if not AProject.LastCompileComplete then begin @@ -1080,6 +1080,9 @@ begin AnUnitInfo:=AnUnitInfo.NextUnitWithEditorIndex; end; + // check project resources + // ToDo + Result:=mrNo; end; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 0e195e4cfb..a534deea0b 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -834,7 +834,7 @@ resourcestring lisInfoBuildWarning = 'Warnings:'; lisInfoBuildProject = 'Project:'; listInfoBuildCompiling = 'Compiling:'; - lisInfoBuildComplile = 'Compiling ...'; + lisInfoBuildCompile = 'Compiling ...'; lisFPCTooOld = 'FPC too old'; lisTheProjectUsesTheNewFPCResourcesWhichRequiresAtLea = 'The project uses ' +'the new FPC resources, which requires at least FPC 2.4'; diff --git a/ide/main.pp b/ide/main.pp index 481511dcfb..03e77a3796 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -12294,7 +12294,7 @@ begin end; end; - CompileProgress.CreateDialog(OwningComponent, Project1.MainFilename, lisInfoBuildComplile); + CompileProgress.CreateDialog(OwningComponent, Project1.MainFilename, lisInfoBuildCompile); // clear old error lines SourceEditorManager.ClearErrorLines; @@ -12570,15 +12570,24 @@ begin Result := mrCancel; - // Check if we can run this project - debugln('TMainIDE.DoInitProjectRun Check if project can run: ',dbgs(pfRunnable in Project1.Flags),' ',dbgs(Project1.MainUnitID)); + // Check if this project is runnable if not ( ((Project1.CompilerOptions.ExecutableType=cetProgram) or (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 - if DoBuildProject(crRun,[pbfOnlyIfNeeded]) <> mrOk then Exit; + debugln('TMainIDE.DoInitProjectRun Check build ...'); + if DoBuildProject(crRun,[pbfOnlyIfNeeded]) <> mrOk then + Exit; // Check project build ProgramFilename := MainBuildBoss.GetProjectTargetFilename(Project1);