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

added more sphisticated FPCTool search function to find fpcmake.exe under windows

Browse Source 
git-svn-id: trunk@8440 -
This commit is contained in:
mattias 2006-01-04 17:08:59 +00:00
parent b032ace882
commit c62d1bc330
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/ideprocs.pp
View File

@ -114,6 +114,7 @@ function FindFilesCaseInsensitive(const Directory,
function FindFirstFileWithExt(const Directory, Ext: string): string; function FindFirstFileWithExt(const Directory, Ext: string): string;
function FindShortFileNameOnDisk(const Filename: string): string; function FindShortFileNameOnDisk(const Filename: string): string;
function CreateNonExistingFilename(const BaseFilename: string): string; function CreateNonExistingFilename(const BaseFilename: string): string;
function FindFPCTool(const Executable, CompilerFilename: string): string;
// search paths // search paths
function TrimSearchPath(const SearchPath, BaseDirectory: string): string; function TrimSearchPath(const SearchPath, BaseDirectory: string): string;
@ -337,6 +338,15 @@ begin
until not FileExists(Result); until not FileExists(Result);
end; end;
function FindFPCTool(const Executable, CompilerFilename: string): string;
begin
Result:=FindDefaultExecutablePath(Executable);
if Result<>'' then exit;
Result:=AppendPathDelim(ExtractFilePath(CompilerFilename))+Executable;
if FileExists(Result) then exit;
Result:='';
end;
function FilenameIsFormText(const Filename: string): boolean; function FilenameIsFormText(const Filename: string): boolean;
var Ext: string; var Ext: string;
begin begin

3
packager/pkgmanager.pas
View File

@ -1299,7 +1299,8 @@ begin
try try
FPCMakeTool.Title:='Creating Makefile for package '+APackage.IDAsString; FPCMakeTool.Title:='Creating Makefile for package '+APackage.IDAsString;
FPCMakeTool.WorkingDirectory:=APackage.Directory; FPCMakeTool.WorkingDirectory:=APackage.Directory;
FPCMakeTool.Filename:='fpcmake'+GetDefaultExecutableExt; FPCMakeTool.Filename:=FindFPCTool('fpcmake'+GetDefaultExecutableExt,
EnvironmentOptions.CompilerFilename);
FPCMakeTool.CmdLineParams:='-TAll'; FPCMakeTool.CmdLineParams:='-TAll';
FPCMakeTool.EnvironmentOverrides.Add( FPCMakeTool.EnvironmentOverrides.Add(
'FPCDIR='+EnvironmentOptions.FPCSourceDirectory); 'FPCDIR='+EnvironmentOptions.FPCSourceDirectory);