paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 21:29:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Append executable name to target filename when only patch is given. Matches with how the executable is created.

Browse Source 
git-svn-id: trunk@53683 -
This commit is contained in:
juha 2016-12-14 16:05:50 +00:00
parent 418b895590
commit e292cc5c48
1 changed files with 21 additions and 20 deletions

41
ide/buildmanager.pas
View File

@ -77,6 +77,7 @@ type
fTargetCPU: string;
fLCLWidgetType: string;
procedure DoOnRescanFPCDirectoryCache(Sender: TObject);
function GetTargetFilename: String;
procedure OnMacroSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string;
const {%H-}Data: PtrInt; var Handled, {%H-}Abort: boolean;
@ -579,36 +580,36 @@ begin
Result:=fLCLWidgetType;
end;
function TBuildManager.GetTargetFilename: String;
begin
Result := GetProjectTargetFilename(Project1);
if GetProjectUsesAppBundle then
// return command line to Application Bundle (darwin only)
Result := ExtractFileNameWithoutExt(Result) + '.app';
end;
function TBuildManager.GetRunCommandLine: string;
var
TargetFileName: string;
function GetTargetFilename: String;
begin
Result := GetProjectTargetFilename(Project1);
if GetProjectUsesAppBundle then
begin
// return command line to Application Bundle (darwin only)
Result := ExtractFileNameWithoutExt(Result) + '.app';
end;
end;
TFN: string; // Target Filename
begin
Result := '';
if Project1=nil then exit;
if Project1.RunParameterOptions.UseLaunchingApplication then
Result := Project1.RunParameterOptions.LaunchingApplicationPathPlusParams;
if Result=''
then begin
Result:=Project1.RunParameterOptions.CmdLineParams;
if GlobalMacroList.SubstituteStr(Result) then begin
TargetFileName:='"'+GetTargetFilename+'"';
if Result='' then
begin
Result := Project1.RunParameterOptions.CmdLineParams;
if GlobalMacroList.SubstituteStr(Result) then
begin
TFN := GetTargetFilename;
if (TFN <> '') and (TFN[Length(TFN)] in AllowDirectorySeparators) then
TFN += ExtractFileNameOnly(Project1.CompilerOptions.GetDefaultMainSourceFileName);
TFN := '"'+TFN+'"';
if Result='' then
Result:=TargetFileName
Result:=TFN
else
Result:=TargetFilename+' '+Result;
Result:=TFN+' '+Result;
end else
Result:='';
end else begin