IDE: run file: fixed running command in working directory, added checkbox to show run output

git-svn-id: trunk@56703 -

ide/buildfiledlg.lfm

@@ -1,7 +1,7 @@
 object BuildFileDialog: TBuildFileDialog
-  Left = 317
+  Left = 873
   Height = 417
-  Top = 153
+  Top = 201
   Width = 451
   ActiveControl = Notebook1
   BorderIcons = [biSystemMenu]
@@ -9,39 +9,41 @@ object BuildFileDialog: TBuildFileDialog
   ClientHeight = 417
   ClientWidth = 451
   KeyPreview = True
-  OnCreate = BuildFileDialogCREATE
-  OnKeyDown = BuildFileDialogKEYDOWN
+  OnCreate = BuildFileDialogCreate
+  OnKeyDown = BuildFileDialogKeyDown
   Position = poScreenCenter
-  LCLVersion = '0.9.27'
+  LCLVersion = '1.9.0.0'
   object Notebook1: TPageControl
     Left = 0
-    Height = 379
+    Height = 377
     Top = 0
     Width = 451
+    ActivePage = RunPage
     Align = alClient
     BorderSpacing.Bottom = 6
+    TabIndex = 2
     TabOrder = 0
     object GeneralPage: TTabSheet
       Caption = 'Options'
-      ClientWidth = 443
-      ClientHeight = 337
+      ClientHeight = 350
+      ClientWidth = 447
       object WhenFileIsActiveGroupbox: TGroupBox
         Left = 6
         Height = 81
         Top = 6
-        Width = 431
+        Width = 435
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'When this file is active in source editor ...'
-        ClientHeight = 63
-        ClientWidth = 427
+        ClientHeight = 66
+        ClientWidth = 431
         TabOrder = 0
         object OverrideBuildProjectCheckbox: TCheckBox
           Left = 6
-          Height = 22
+          Height = 24
           Top = 6
-          Width = 415
+          Width = 419
           Align = alTop
           BorderSpacing.Around = 6
           Caption = 'On build project execute the Build File command instead'
@@ -49,9 +51,9 @@ object BuildFileDialog: TBuildFileDialog
         end
         object OverrideRunProjectCheckbox: TCheckBox
           Left = 6
-          Height = 22
-          Top = 34
-          Width = 415
+          Height = 24
+          Top = 36
+          Width = 419
           Align = alTop
           BorderSpacing.Around = 6
           Caption = 'On run project execute the Run File command instead'
@@ -61,8 +63,8 @@ object BuildFileDialog: TBuildFileDialog
     end
     object BuildPage: TTabSheet
       Caption = 'Build'
-      ClientWidth = 443
-      ClientHeight = 337
+      ClientHeight = 350
+      ClientWidth = 447
       object BuildCommandGroupbox: TGroupBox
         Left = 6
         Height = 80
@@ -71,7 +73,7 @@ object BuildFileDialog: TBuildFileDialog
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Build Command'
-        ClientHeight = 62
+        ClientHeight = 65
         ClientWidth = 427
         TabOrder = 0
         object BuildCommandMemo: TMemo
@@ -116,7 +118,7 @@ object BuildFileDialog: TBuildFileDialog
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Working directory (Leave empty for file path)'
-        ClientHeight = 42
+        ClientHeight = 45
         ClientWidth = 427
         TabOrder = 3
         object BuildWorkDirCombobox: TComboBox
@@ -128,10 +130,8 @@ object BuildFileDialog: TBuildFileDialog
           Top = 6
           Width = 384
           Anchors = [akTop, akLeft, akRight]
-          AutoComplete = False
           BorderSpacing.Around = 6
-          ItemHeight = 13
-          ItemWidth = 0
+          ItemHeight = 0
           TabOrder = 0
           Text = 'BuildWorkDirCombobox'
         end
@@ -153,34 +153,34 @@ object BuildFileDialog: TBuildFileDialog
     end
     object RunPage: TTabSheet
       Caption = 'Run'
-      ClientWidth = 443
-      ClientHeight = 353
-      object AlwaysCompileFirstCheckbox: TCheckBox
+      ClientHeight = 350
+      ClientWidth = 447
+      object RunBeforeBuildCheckbox: TCheckBox
         Left = 6
-        Height = 17
+        Height = 24
         Top = 6
-        Width = 431
+        Width = 435
         Align = alTop
         BorderSpacing.Around = 6
-        Caption = 'Always Build before Run'
+        Caption = 'Run before build'
         TabOrder = 0
       end
       object RunCommandGroupbox: TGroupBox
         Left = 6
         Height = 98
-        Top = 88
-        Width = 431
+        Top = 126
+        Width = 435
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Run Command'
-        ClientHeight = 80
-        ClientWidth = 427
+        ClientHeight = 83
+        ClientWidth = 431
         TabOrder = 1
         object RunCommandMemo: TMemo
           Left = 6
-          Height = 68
+          Height = 71
           Top = 6
-          Width = 415
+          Width = 419
           Align = alClient
           BorderSpacing.Around = 6
           Lines.Strings = (
@@ -191,36 +191,34 @@ object BuildFileDialog: TBuildFileDialog
       end
       object RunWorkDirGroupbox: TGroupBox
         Left = 6
-        Height = 53
-        Top = 29
-        Width = 431
+        Height = 54
+        Top = 66
+        Width = 435
         Align = alTop
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Working Directory (Leave empty for file path)'
-        ClientHeight = 35
-        ClientWidth = 427
+        ClientHeight = 39
+        ClientWidth = 431
         TabOrder = 2
         object RunWorkDirCombobox: TComboBox
           AnchorSideLeft.Control = RunWorkDirGroupbox
           AnchorSideTop.Control = RunWorkDirGroupbox
           AnchorSideRight.Control = RunBrowseWorkDirButton
           Left = 6
-          Height = 21
+          Height = 27
           Top = 6
-          Width = 384
+          Width = 388
           Anchors = [akTop, akLeft, akRight]
-          AutoComplete = False
           BorderSpacing.Around = 6
-          ItemHeight = 13
-          ItemWidth = 0
+          ItemHeight = 0
           TabOrder = 0
           Text = 'RunWorkDirCombobox'
         end
         object RunBrowseWorkDirButton: TButton
           AnchorSideRight.Side = asrBottom
-          Left = 396
-          Height = 23
+          Left = 400
+          Height = 27
           Top = 6
           Width = 25
           HelpType = htKeyword
@@ -231,13 +229,31 @@ object BuildFileDialog: TBuildFileDialog
           TabOrder = 1
         end
       end
+      object RunShowOutputCheckBox: TCheckBox
+        Left = 6
+        Height = 24
+        Top = 36
+        Width = 435
+        Align = alTop
+        BorderSpacing.Around = 6
+        Caption = 'Show output in Messages window'
+        TabOrder = 3
+      end
     end
   end
   object ButtonPanel: TButtonPanel
     Left = 6
-    Height = 26
-    Top = 385
+    Height = 28
+    Top = 383
     Width = 439
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
     TabOrder = 1
     ShowButtons = [pbOK, pbCancel, pbHelp]
     ShowBevel = False

ide/buildfiledlg.pas

@@ -1,3 +1,5 @@
+{ Dialog to configure Build/Run file
+}
 unit BuildFileDlg;
 
 {$mode objfpc}{$H+}
@@ -37,32 +39,33 @@ type
   { TBuildFileDialog }
 
   TBuildFileDialog = class(TForm)
-    AlwaysCompileFirstCheckbox: TCHECKBOX;
-    BuildBrowseWorkDirButton: TBUTTON;
-    BuildCommandGroupbox: TGROUPBOX;
-    BuildCommandMemo: TMEMO;
-    BuildScanForFPCMsgCheckbox: TCHECKBOX;
-    BuildScanForMakeMsgCheckbox: TCHECKBOX;
-    BuildWorkDirCombobox: TCOMBOBOX;
-    BuildWorkingDirGroupbox: TGROUPBOX;
+    RunBeforeBuildCheckbox: TCheckBox;
+    BuildBrowseWorkDirButton: TButton;
+    BuildCommandGroupbox: TGroupBox;
+    BuildCommandMemo: TMemo;
+    BuildScanForFPCMsgCheckbox: TCheckBox;
+    BuildScanForMakeMsgCheckbox: TCheckBox;
+    BuildWorkDirCombobox: TComboBox;
+    BuildWorkingDirGroupbox: TGroupBox;
     BuildPage: TTabSheet;
     ButtonPanel: TButtonPanel;
     GeneralPage: TTabSheet;
     Notebook1: TPageControl;
-    OverrideBuildProjectCheckbox: TCHECKBOX;
-    OverrideRunProjectCheckbox: TCHECKBOX;
-    RunBrowseWorkDirButton: TBUTTON;
-    RunCommandGroupbox: TGROUPBOX;
-    RunCommandMemo: TMEMO;
+    OverrideBuildProjectCheckbox: TCheckBox;
+    OverrideRunProjectCheckbox: TCheckBox;
+    RunBrowseWorkDirButton: TButton;
+    RunCommandGroupbox: TGroupBox;
+    RunCommandMemo: TMemo;
     RunPage: TTabSheet;
-    RunWorkDirCombobox: TCOMBOBOX;
-    RunWorkDirGroupbox: TGROUPBOX;
-    WhenFileIsActiveGroupbox: TGROUPBOX;
+    RunWorkDirCombobox: TComboBox;
+    RunWorkDirGroupbox: TGroupBox;
+    RunShowOutputCheckBox: TCheckBox;
+    WhenFileIsActiveGroupbox: TGroupBox;
     BuildMacroSelectionBox: TMacroSelectionBox;
     RunMacroSelectionBox: TMacroSelectionBox;
     procedure BuildBrowseWorkDirButtonCLICK(Sender: TObject);
-    procedure BuildFileDialogCREATE(Sender: TObject);
-    procedure BuildFileDialogKEYDOWN(Sender: TObject; var Key: Word;
+    procedure BuildFileDialogCreate(Sender: TObject);
+    procedure BuildFileDialogKeyDown(Sender: TObject; var Key: Word;
                                      {%H-}Shift: TShiftState);
     procedure BuildMacroSelectionBoxAddMacro(Sender: TObject);
     procedure HelpButtonClick(Sender: TObject);
@@ -434,7 +437,7 @@ end;
 
 { TBuildFileDialog }
 
-procedure TBuildFileDialog.BuildFileDialogKEYDOWN(Sender: TObject;
+procedure TBuildFileDialog.BuildFileDialogKeyDown(Sender: TObject;
   var Key: Word; Shift: TShiftState);
 begin
   if Key=VK_ESCAPE then ModalResult:=mrCancel;
@@ -473,7 +476,7 @@ begin
   RunCommandMemo.SelText:=MacroCode;
 end;
 
-procedure TBuildFileDialog.BuildFileDialogCREATE(Sender: TObject);
+procedure TBuildFileDialog.BuildFileDialogCreate(Sender: TObject);
 begin
   Notebook1.PageIndex:=0;
   
@@ -513,7 +516,8 @@ begin
   BuildScanForMakeMsgCheckbox.Caption:=lisCOScanForMakeMessages;
 
   RunPage.Caption:=lisRun;
-  AlwaysCompileFirstCheckbox.Caption:=lisBFAlwaysBuildBeforeRun;
+  RunBeforeBuildCheckbox.Caption:=lisBFAlwaysBuildBeforeRun;
+  RunShowOutputCheckBox.Caption:=lisShowOutput;
   RunWorkDirGroupbox.Caption:=lisBFWorkingDirectoryLeaveEmptyForFilePath;
   RunCommandGroupbox.Caption:=lisBFRunCommand;
 
@@ -605,7 +609,6 @@ var
   BuildCommand: String;
   BuildScanForFPCMsg: Boolean;
   BuildScanForMakeMsg: Boolean;
-  AlwaysBuildBeforeRun: Boolean;
   RunWorkingDir: String;
   RunCommand: String;
   BuildScanStr: String;
@@ -630,7 +633,6 @@ begin
   RunFlags:=GetIDEDirRunFlagFromString(
                GetIDEStringDirective(DirectiveList,
                                      IDEDirectiveNames[idedRunFlags],''));
-  AlwaysBuildBeforeRun:=idedrfBuildBeforeRun in RunFlags;
   RunWorkingDir:=GetIDEStringDirective(DirectiveList,
                                        IDEDirectiveNames[idedRunWorkingDir],'');
   RunCommand:=GetIDEStringDirective(DirectiveList,
@@ -642,7 +644,8 @@ begin
   BuildCommandMemo.Lines.Text:=BuildCommand;
   BuildScanForFPCMsgCheckbox.Checked:=BuildScanForFPCMsg;
   BuildScanForMakeMsgCheckbox.Checked:=BuildScanForMakeMsg;
-  AlwaysCompileFirstCheckbox.Checked:=AlwaysBuildBeforeRun;
+  RunBeforeBuildCheckbox.Checked:=idedrfBuildBeforeRun in RunFlags;
+  RunShowOutputCheckBox.Checked:=idedrfMessages in RunFlags;
   RunWorkDirCombobox.Text:=RunWorkingDir;
   RunCommandMemo.Lines.Text:=RunCommand;
 end;
@@ -654,7 +657,6 @@ var
   BuildScanForFPCMsg: Boolean;
   BuildScanForMakeMsg: Boolean;
   BuildScan: TIDEDirBuildScanFlags;
-  AlwaysBuildBeforeRun: Boolean;
   RunWorkingDir: String;
   RunCommand: String;
   RunFlags: TIDEDirRunFlags;
@@ -670,9 +672,9 @@ begin
   if BuildScanForMakeMsg then Include(BuildScan,idedbsfMake);
 
   // run
-  AlwaysBuildBeforeRun:=AlwaysCompileFirstCheckbox.Checked;
   RunFlags:=[];
-  if AlwaysBuildBeforeRun then Include(RunFlags,idedrfBuildBeforeRun);
+  if RunBeforeBuildCheckbox.Checked then Include(RunFlags,idedrfBuildBeforeRun);
+  if RunShowOutputCheckBox.Checked then Include(RunFlags,idedrfMessages);
   RunWorkingDir:=SpecialCharsToSpaces(RunWorkDirCombobox.Text,true);
   RunCommand:=SpecialCharsToSpaces(RunCommandMemo.Lines.Text,true);
   

ide/lazarusidestrconsts.pas

@@ -496,6 +496,7 @@ resourcestring
   lisMenuProjectOptions = 'Project Options ...';
 
   lisBFWorkingDirectoryLeaveEmptyForFilePath = 'Working directory (leave empty for file path)';
+  lisShowOutput = 'Show output';
   lisBFBuildCommand = 'Build Command';
   lisMenuQuickCompile = 'Quick Compile';
   lisMenuCleanUpAndBuild = 'Clean up and Build ...';

ide/main.pp

@@ -7662,7 +7662,7 @@ var
   DefRunCommand: String;
   RunCommand: String;
   ProgramFilename: string;
-  Params: string;
+  Params, aFilename: string;
   ExtTool: TIDEExternalToolOptions;
   DirectiveList: TStringList;
   Code: TCodeBuffer;
@@ -7732,6 +7732,19 @@ begin
     SourceEditorManager.ClearErrorLines;
 
     SplitCmdLine(RunCommand,ProgramFilename,Params);
+    aFilename:=ProgramFilename;
+    if (aFilename<>'')
+    and (not FilenameIsAbsolute(aFilename))
+    and (Pos(PathDelim,aFilename)<1)
+    then begin
+      aFilename:=FileUtil.FindDefaultExecutablePath(aFilename,RunWorkingDir);
+      if aFilename='' then
+        aFilename:=ProgramFilename;
+    end;
+    if aFilename<>'' then
+      aFilename:=ExpandFileNameUTF8(aFilename,RunWorkingDir);
+    if (aFilename<>'') and FileExistsUTF8(aFilename) then
+      ProgramFilename:=aFilename;
 
     ExtTool:=TIDEExternalToolOptions.Create;
     try