fixed run and wait script

git-svn-id: trunk@3936 -
This commit is contained in:
mattias 2003-03-16 08:44:18 +00:00
parent 051346eea3
commit fcce0f3ad8
4 changed files with 4 additions and 16 deletions

1
.gitattributes vendored
View File

@ -822,7 +822,6 @@ packager/ucomponentmanmain.pas svneol=native#text/pascal
packager/ufrmaddcomponent.lfm svneol=native#text/plain packager/ufrmaddcomponent.lfm svneol=native#text/plain
packager/ufrmaddcomponent.lrs svneol=native#text/pascal packager/ufrmaddcomponent.lrs svneol=native#text/pascal
packager/ufrmaddcomponent.pas svneol=native#text/pascal packager/ufrmaddcomponent.pas svneol=native#text/pascal
tools/RunAndWait.sh -text svneol=native#application/x-sh
tools/apiwizz/apiwizard.pp svneol=native#text/pascal tools/apiwizz/apiwizard.pp svneol=native#text/pascal
tools/apiwizz/apiwizz.pp svneol=native#text/pascal tools/apiwizz/apiwizz.pp svneol=native#text/pascal
tools/install/create_fpc_export_tgz.sh -text svneol=native#application/x-sh tools/install/create_fpc_export_tgz.sh -text svneol=native#application/x-sh

View File

@ -2382,7 +2382,8 @@ begin
+';'+Dir+'rtl'+DS+'objpas'+DS +';'+Dir+'rtl'+DS+'objpas'+DS
+';'+Dir+'rtl'+DS+'inc'+DS +';'+Dir+'rtl'+DS+'inc'+DS
+';'+Dir+'rtl'+DS+TargetProcessor+DS +';'+Dir+'rtl'+DS+TargetProcessor+DS
+';'+Dir+'rtl'+DS+SrcOS+DS; +';'+Dir+'rtl'+DS+SrcOS+DS
+';'+Dir+'rtl'+DS+SrcOS+DS+TargetProcessor+DS;
if (TargetOS<>'') and (TargetOS<>SrcOS) then if (TargetOS<>'') and (TargetOS<>SrcOS) then
s:=s+';'+Dir+'rtl'+DS+TargetOS+DS; s:=s+';'+Dir+'rtl'+DS+TargetOS+DS;
RTLDir.AddChild(TDefineTemplate.Create('Include Path', RTLDir.AddChild(TDefineTemplate.Create('Include Path',

View File

@ -171,7 +171,7 @@ implementation
const const
DefaultLauncherApplication = DefaultLauncherApplication =
'/usr/X11R6/bin/xterm -T ''Lazarus Run Output''' '/usr/X11R6/bin/xterm -T ''Lazarus Run Output'''
+' -e $(LazarusDir)/tools/RunAndWait.sh $(TargetCmdLine)'; +' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)';
function ShowRunParamsOptsDlg(RunParamsOptions: TRunParamsOptions):TModalResult; function ShowRunParamsOptsDlg(RunParamsOptions: TRunParamsOptions):TModalResult;
var var
@ -457,7 +457,7 @@ begin
Items.Add(DefaultLauncherApplication); Items.Add(DefaultLauncherApplication);
{$IFNDEF win32} {$IFNDEF win32}
Items.Add('/usr/bin/gnome-terminal -t ''Lazarus Run Output''' Items.Add('/usr/bin/gnome-terminal -t ''Lazarus Run Output'''
+' -e ''$(LazarusDir)/tools/RunAndWait.sh $(TargetCmdLine)'''); +' -e ''$(LazarusDir)/tools/runwait.sh $(TargetCmdLine)''');
{$ENDIF} {$ENDIF}
EndUpdate; EndUpdate;
end; end;

View File

@ -1,12 +0,0 @@
#!/bin/bash
CommandLine=$@
#set -x
echo $CommandLine
$CommandLine
echo "--------------------------------------------------"
echo "Press enter"
read
# end.