IDE: run parameters: working directory: support macros

git-svn-id: trunk@32608 -
This commit is contained in:
mattias 2011-10-01 22:06:35 +00:00
parent 7136bc4b7a
commit 5f36b89cef
2 changed files with 3 additions and 1 deletions

View File

@ -83,6 +83,7 @@ begin
AProject.LazCompilerOptions.SetAlternativeCompile( AProject.LazCompilerOptions.SetAlternativeCompile(
'instantfpc --skip-run -B -gl "-Fu$(ProjUnitPath)" $Name($(ProjFile))',true); 'instantfpc --skip-run -B -gl "-Fu$(ProjUnitPath)" $Name($(ProjFile))',true);
AProject.RunParameters.HostApplicationFilename:='$(InstantFPCCache)/$NameOnly($(ProjFile))'; AProject.RunParameters.HostApplicationFilename:='$(InstantFPCCache)/$NameOnly($(ProjFile))';
AProject.RunParameters.WorkingDirectory:='$(ProjPath)';
// create program source // create program source
NewSource:=TStringList.Create; NewSource:=TStringList.Create;

View File

@ -51,7 +51,7 @@ uses
// IDE // IDE
LazConf, CompilerOptions, EditorOptions, EnvironmentOpts, KeyMapping, LazConf, CompilerOptions, EditorOptions, EnvironmentOpts, KeyMapping,
SourceEditor, ProjectDefs, Project, IDEProcs, InputHistory, Debugger, SourceEditor, ProjectDefs, Project, IDEProcs, InputHistory, Debugger,
CmdLineDebugger, IDEOptionDefs, LazarusIDEStrConsts, CmdLineDebugger, IDEOptionDefs, LazarusIDEStrConsts, TransferMacros,
MainBar, MainIntf, MainBase, BaseBuildManager, MainBar, MainIntf, MainBase, BaseBuildManager,
SourceMarks, SourceMarks,
DebuggerDlg, Watchesdlg, BreakPointsdlg, BreakPropertyDlg, LocalsDlg, WatchPropertyDlg, DebuggerDlg, Watchesdlg, BreakPointsdlg, BreakPropertyDlg, LocalsDlg, WatchPropertyDlg,
@ -2083,6 +2083,7 @@ begin
Project1.RunParameterOptions.AssignEnvironmentTo(FDebugger.Environment); Project1.RunParameterOptions.AssignEnvironmentTo(FDebugger.Environment);
NewWorkingDir:=Project1.RunParameterOptions.WorkingDirectory; NewWorkingDir:=Project1.RunParameterOptions.WorkingDirectory;
GlobalMacroList.SubstituteStr(NewWorkingDir);
if (NewWorkingDir<>'') and (not DirectoryExistsUTF8(NewWorkingDir)) then begin if (NewWorkingDir<>'') and (not DirectoryExistsUTF8(NewWorkingDir)) then begin
MessageDlg(lisUnableToRun, MessageDlg(lisUnableToRun,
Format(lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki, ['"', Format(lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki, ['"',