paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 20:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

MG: improved default make path for build lazarus

Browse Source 
git-svn-id: trunk@1768 -
This commit is contained in:
lazarus 2002-07-01 05:53:31 +00:00
parent 435157e80e
commit b3adab2b9e
6 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/buildlazdialog.pas
View File

@ -35,7 +35,7 @@ interface
uses uses
Classes, SysUtils, Forms, Controls, StdCtrls, ExtCtrls, Buttons, LResources, Classes, SysUtils, Forms, Controls, StdCtrls, ExtCtrls, Buttons, LResources,
XMLCfg, ExtToolDialog, ExtToolEditDlg, TransferMacros; XMLCfg, ExtToolDialog, ExtToolEditDlg, TransferMacros, LazConf;
type type
TMakeMode = (mmNone, mmBuild, mmCleanBuild); TMakeMode = (mmNone, mmBuild, mmCleanBuild);
@ -152,6 +152,10 @@ begin
Tool:=TExternalToolOptions.Create; Tool:=TExternalToolOptions.Create;
try try
Tool.Filename:=Options.MakeFilename; Tool.Filename:=Options.MakeFilename;
if not FileExists(Tool.Filename) then begin
Tool.Filename:=FindDefaultMakePath;
if not FileExists(Tool.Filename) then exit;
end;
Tool.ScanOutputForFPCMessages:=true; Tool.ScanOutputForFPCMessages:=true;
Tool.ScanOutputForMakeMessages:=true; Tool.ScanOutputForMakeMessages:=true;
if Options.CleanAll then begin if Options.CleanAll then begin
@ -523,7 +527,7 @@ end;
constructor TBuildLazarusOptions.Create; constructor TBuildLazarusOptions.Create;
begin begin
inherited Create; inherited Create;
fMakeFilename:='/usr/bin/make'; fMakeFilename:='';
end; end;

15
ide/include/freebsd/lazconf.inc
View File

@ -101,12 +101,12 @@ end;
function FindDefaultCompilerPath: string; function FindDefaultCompilerPath: string;
begin begin
if FileIsExecutable('/usr/bin/ppc386') then Result:=SearchFileInPath('ppc386','',GetEnv('PATH'),':');
Result:='/usr/bin/ppc386' end;
else if FileIsExecutable('/opt/fpc/ppc386') then
Result:='/opt/fpc/ppc386' function FindDefaultMakePath: string;
else begin
Result:=''; Result:=SearchFileInPath('make','',GetEnv('PATH'),':');
end; end;
@ -117,6 +117,9 @@ initialization
{ {
$Log$ $Log$
Revision 1.6 2002/07/01 05:53:31 lazarus
MG: improved default make path for build lazarus
Revision 1.5 2002/05/10 06:57:51 lazarus Revision 1.5 2002/05/10 06:57:51 lazarus
MG: updated licenses MG: updated licenses

8
ide/include/linux/lazconf.inc
View File

@ -106,12 +106,20 @@ begin
Result:=SearchFileInPath('ppc386','',GetEnv('PATH'),':'); Result:=SearchFileInPath('ppc386','',GetEnv('PATH'),':');
end; end;
function FindDefaultMakePath: string;
begin
Result:=SearchFileInPath('make','',GetEnv('PATH'),':');
end;
initialization initialization
PrimaryConfigPath:=FExpand('~/.lazarus'); PrimaryConfigPath:=FExpand('~/.lazarus');
SecondaryConfigPath:='/etc/lazarus'; SecondaryConfigPath:='/etc/lazarus';
{ {
$Log$ $Log$
Revision 1.8 2002/07/01 05:53:31 lazarus
MG: improved default make path for build lazarus
Revision 1.7 2002/07/01 05:11:34 lazarus Revision 1.7 2002/07/01 05:11:34 lazarus
MG: improved default path to lazarus and ppc386 MG: improved default path to lazarus and ppc386

15
ide/include/netbsd/lazconf.inc
View File

@ -101,12 +101,12 @@ end;
function FindDefaultCompilerPath: string; function FindDefaultCompilerPath: string;
begin begin
if FileIsExecutable('/usr/bin/ppc386') then Result:=SearchFileInPath('ppc386','',GetEnv('PATH'),':');
Result:='/usr/bin/ppc386' end;
else if FileIsExecutable('/opt/fpc/ppc386') then
Result:='/opt/fpc/ppc386' function FindDefaultMakePath: string;
else begin
Result:=''; Result:=SearchFileInPath('make','',GetEnv('PATH'),':');
end; end;
@ -117,6 +117,9 @@ initialization
{ {
$Log$ $Log$
Revision 1.3 2002/07/01 05:53:31 lazarus
MG: improved default make path for build lazarus
Revision 1.2 2002/05/10 06:57:51 lazarus Revision 1.2 2002/05/10 06:57:51 lazarus
MG: updated licenses MG: updated licenses

7
ide/include/win32/lazconf.inc
View File

@ -98,6 +98,10 @@ begin
Result:=''; Result:='';
end; end;
function FindDefaultMakePath: string;
begin
Result:='';
end;
initialization initialization
PrimaryConfigPath:=ExtractFilePath(Paramstr(0)); PrimaryConfigPath:=ExtractFilePath(Paramstr(0));
@ -110,6 +114,9 @@ initialization
{ {
$Log$ $Log$
Revision 1.6 2002/07/01 05:53:31 lazarus
MG: improved default make path for build lazarus
Revision 1.5 2002/05/10 06:57:51 lazarus Revision 1.5 2002/05/10 06:57:51 lazarus
MG: updated licenses MG: updated licenses

4
ide/lazconf.pp
View File

@ -66,6 +66,7 @@ uses
procedure CopySecondaryConfigFile(const AFilename: String); procedure CopySecondaryConfigFile(const AFilename: String);
function FindDefaultCompilerPath: string; function FindDefaultCompilerPath: string;
function FindDefaultMakePath: string;
implementation implementation
@ -75,6 +76,9 @@ end.
{ {
$Log$ $Log$
Revision 1.8 2002/07/01 05:53:31 lazarus
MG: improved default make path for build lazarus
Revision 1.7 2002/07/01 05:11:34 lazarus Revision 1.7 2002/07/01 05:11:34 lazarus
MG: improved default path to lazarus and ppc386 MG: improved default path to lazarus and ppc386