From 025665bfd56e70a0fff26e45c5431969b985f7ff Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 31 May 2011 22:41:12 +0000 Subject: [PATCH] IDE: clean compile: clean up build files git-svn-id: trunk@30995 - --- ide/keymapping.pp | 12 ++++++------ ide/lazarusidestrconsts.pas | 6 +++--- ide/main.pp | 8 ++++---- ide/mainbar.pas | 2 +- ide/mainbase.pas | 2 +- ideintf/idecommands.pas | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ide/keymapping.pp b/ide/keymapping.pp index b316557834..3ff57ecd04 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -555,7 +555,7 @@ begin ecCompile: SetResult(VK_F9,[ssCtrl],VK_UNKNOWN,[]); ecBuild: SetResult(VK_F9,[ssShift],VK_UNKNOWN,[]); ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); - ecCleanCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); + ecCleanUpCompiled: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecRun: SetResult(VK_F9,[],VK_UNKNOWN,[]); ecPause: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -997,7 +997,7 @@ begin ecCompile: SetResult(VK_F9,[ssCtrl],VK_UNKNOWN,[]); ecBuild: SetResult(VK_F9,[ssShift],VK_UNKNOWN,[]); ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); - ecCleanCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); + ecCleanUpCompiled: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecRun: SetResult(VK_F9,[],VK_UNKNOWN,[]); ecPause: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -1630,7 +1630,7 @@ begin ecCompile: SetResult(VK_B,[ssMeta],VK_UNKNOWN,[]); ecBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); - ecCleanCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); + ecCleanUpCompiled: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecRun: SetResult(VK_R,[ssMeta],VK_UNKNOWN,[]); ecPause: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -1797,7 +1797,7 @@ begin ecCompile: SetResult(VK_F9,[ssCtrl],VK_F9,[ssCtrl,ssMeta]); ecBuild: SetResult(VK_F9,[ssShift],VK_UNKNOWN,[]); ecQuickCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); - ecCleanCompile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); + ecCleanUpCompiled: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecAbortBuild: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecRun: SetResult(VK_F9,[],VK_F9,[ssMeta]); ecPause: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -2171,7 +2171,7 @@ begin ecCompile : Result:= srkmecCompile; ecBuild : Result:= srkmecBuild; ecQuickCompile : Result:= srkmecQuickCompile; - ecCleanCompile : Result:= srkmecCleanCompile; + ecCleanUpCompiled : Result:= srkmecCleanUpCompiled; ecAbortBuild : Result:= srkmecAbortBuild; ecRun : Result:= srkmecRun; ecPause : Result:= srkmecPause; @@ -2820,7 +2820,7 @@ begin AddDefault(C, 'Compile project/program', lisKMCompileProjectProgram, ecCompile); AddDefault(C, 'Build project/program', lisKMBuildProjectProgram, ecBuild); AddDefault(C, 'Quick compile, no linking', lisKMQuickCompileNoLinking, ecQuickCompile); - AddDefault(C, 'Clean up and compile project/program', lisKMCleanCompile, ecCleanCompile); + AddDefault(C, 'Clean up and compile project/program', lisKMCleanUpCompiled, ecCleanUpCompiled); AddDefault(C, 'Abort building', lisKMAbortBuilding, ecAbortBuild); AddDefault(C, 'Run program', lisKMRunProgram, ecRun); AddDefault(C, 'Pause program', lisKMPauseProgram, ecPause); diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index b6ba5c6fb3..288eacb5d7 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -347,7 +347,7 @@ resourcestring lisBFBuildCommand = 'Build Command'; lisMenuBuild = 'Build'; lisMenuQuickCompile = 'Quick compile'; - lisMenuCleanCompile = 'Clean compile'; + lisMenuCleanUpCompiled = 'Clean up build files'; lisMenuAbortBuild = 'Abort Build'; lisMenuProjectRun = '&Run'; lisBFAlwaysBuildBeforeRun = 'Always Build before Run'; @@ -2682,7 +2682,7 @@ resourcestring srkmecCompile = 'compile program/project'; srkmecBuild = 'build program/project'; srkmecQuickCompile = 'quick compile, no linking'; - srkmecCleanCompile = 'clean up and compile'; + srkmecCleanUpCompiled = 'clean up build files'; srkmecAbortBuild = 'abort build'; srkmecRun = 'run program'; srkmecPause = 'pause program'; @@ -2774,7 +2774,7 @@ resourcestring lisKMCompileProjectProgram = 'Compile project/program'; lisKMBuildProjectProgram = 'Build project/program'; lisKMQuickCompileNoLinking = 'Quick compile, no linking'; - lisKMCleanCompile = 'Clean up and compile project/program'; + lisKMCleanUpCompiled = 'Clean up build files'; lisKMAbortBuilding = 'Abort building'; lisKMRunProgram = 'Run program'; lisKMPauseProgram = 'Pause program'; diff --git a/ide/main.pp b/ide/main.pp index cac97cf2ef..070c34f706 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -318,7 +318,7 @@ type procedure mnuCompileProjectClicked(Sender: TObject); procedure mnuBuildProjectClicked(Sender: TObject); procedure mnuQuickCompileProjectClicked(Sender: TObject); - procedure mnuCleanCompileProjectClicked(Sender: TObject); + procedure mnuCleanUpCompiledProjectClicked(Sender: TObject); procedure mnuAbortBuildProjectClicked(Sender: TObject); procedure mnuRunProjectClicked(Sender: TObject); procedure mnuPauseProjectClicked(Sender: TObject); @@ -2601,7 +2601,7 @@ begin itmRunMenuCompile.OnClick := @mnuCompileProjectClicked; itmRunMenuBuild.OnClick := @mnuBuildProjectClicked; itmRunMenuQuickCompile.OnClick := @mnuQuickCompileProjectClicked; - itmRunMenuCleanCompile.OnClick := @mnuCleanCompileProjectClicked; + itmRunMenuCleanUpCompiled.OnClick := @mnuCleanUpCompiledProjectClicked; itmRunMenuAbortBuild.OnClick := @mnuAbortBuildProjectClicked; itmRunMenuRun.OnClick := @mnuRunProjectClicked; itmRunMenuPause.OnClick := @mnuPauseProjectClicked; @@ -3216,7 +3216,7 @@ begin end; ecBuild: DoBuildProject(crBuild, [pbfCleanCompile, pbfCompileDependenciesClean]); - ecCleanCompile: mnuCleanCompileProjectClicked(nil); + ecCleanUpCompiled: mnuCleanUpCompiledProjectClicked(nil); ecQuickCompile: DoQuickCompile; ecAbortBuild: DoAbortBuild; @@ -4351,7 +4351,7 @@ begin DoQuickCompile; end; -procedure TMainIDE.mnuCleanCompileProjectClicked(Sender: TObject); +procedure TMainIDE.mnuCleanUpCompiledProjectClicked(Sender: TObject); begin if Project1.MainUnitInfo=nil then begin // this project has no source to compile diff --git a/ide/mainbar.pas b/ide/mainbar.pas index 76681032ea..878e47960e 100644 --- a/ide/mainbar.pas +++ b/ide/mainbar.pas @@ -279,7 +279,7 @@ type itmRunMenuCompile: TIDEMenuCommand; itmRunMenuBuild: TIDEMenuCommand; itmRunMenuQuickCompile: TIDEMenuCommand; - itmRunMenuCleanCompile: TIDEMenuCommand; + itmRunMenuCleanUpCompiled: TIDEMenuCommand; itmRunMenuAbortBuild: TIDEMenuCommand; //itmRunnning: TIDEMenuSection; itmRunMenuRun: TIDEMenuCommand; diff --git a/ide/mainbase.pas b/ide/mainbase.pas index 500996a30a..84f220df4d 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -671,7 +671,7 @@ begin CreateMenuItem(ParentMI,itmRunMenuCompile,'itmRunMenuCompile',lisMenuCompile,'menu_build'); CreateMenuItem(ParentMI,itmRunMenuBuild,'itmRunMenuBuild',lisMenuBuild,'menu_build_all'); CreateMenuItem(ParentMI,itmRunMenuQuickCompile,'itmRunMenuQuickCompile',lisMenuQuickCompile,'menu_quick_compile'); - CreateMenuItem(ParentMI,itmRunMenuCleanCompile,'itmRunMenuCleanCompile',lisMenuCleanCompile,'menu_build'); + CreateMenuItem(ParentMI,itmRunMenuCleanUpCompiled,'itmRunMenuCleanUpCompiled',lisMenuCleanUpCompiled,'menu_build'); CreateMenuItem(ParentMI,itmRunMenuAbortBuild,'itmRunMenuAbortBuild',lisMenuAbortBuild,'menu_abort_build'); CreateMenuSeparatorSection(mnuRun,itmRunnning,'itmRunnning'); diff --git a/ideintf/idecommands.pas b/ideintf/idecommands.pas index 1c222ae238..1275d364cf 100644 --- a/ideintf/idecommands.pas +++ b/ideintf/idecommands.pas @@ -233,7 +233,7 @@ const ecCompile = ecFirstLazarus + 400; ecBuild = ecFirstLazarus + 401; ecQuickCompile = ecFirstLazarus + 402; - ecCleanCompile = ecFirstLazarus + 403; + ecCleanUpCompiled = ecFirstLazarus + 403; ecAbortBuild = ecFirstLazarus + 404; ecRun = ecFirstLazarus + 410; ecPause = ecFirstLazarus + 411;