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

fixed fpcmake extension on creating Makefile

Browse Source 
git-svn-id: trunk@8438 -
This commit is contained in:
mattias 2006-01-04 12:59:34 +00:00
parent 93bcaa38be
commit dbba7ab026
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/opengl/example/testopenglcontext1.lpi
View File

@ -11,7 +11,7 @@
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/> <IconPath Value="./"/>
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
<ActiveEditorIndexAtStart Value="0"/> <ActiveEditorIndexAtStart Value="3"/>
</General> </General>
<LazDoc Paths=""/> <LazDoc Paths=""/>
<Units Count="2"> <Units Count="2">
@ -24,7 +24,7 @@
<UsageCount Value="134"/> <UsageCount Value="134"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<CursorPos X="45" Y="109"/> <CursorPos X="9" Y="107"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<Filename Value="mainunit.pas"/> <Filename Value="mainunit.pas"/>
<ComponentName Value="Form1"/> <ComponentName Value="Form1"/>

15
ide/exttooldialog.pas
View File

@ -273,6 +273,7 @@ function TExternalToolList.Run(ExtTool: TExternalToolOptions;
var WorkingDir, Filename, Params, CmdLine, Title: string; var WorkingDir, Filename, Params, CmdLine, Title: string;
TheProcess: TProcess; TheProcess: TProcess;
Abort, ErrorOccurred: boolean; Abort, ErrorOccurred: boolean;
NewFilename: String;
begin begin
Result:=mrCancel; Result:=mrCancel;
if ExtTool=nil then exit; if ExtTool=nil then exit;
@ -284,8 +285,18 @@ begin
if (not Macros.SubstituteStr(Filename)) then exit; if (not Macros.SubstituteStr(Filename)) then exit;
if (not Macros.SubstituteStr(WorkingDir)) then exit; if (not Macros.SubstituteStr(WorkingDir)) then exit;
if (not Macros.SubstituteStr(Params)) then exit; if (not Macros.SubstituteStr(Params)) then exit;
if not FilenameIsAbsolute(Filename) then if not FilenameIsAbsolute(Filename) then begin
Filename:=FindProgram(Filename,GetCurrentDir,false); NewFilename:=FindProgram(Filename,GetCurrentDir,false);
if NewFilename='' then begin
Result:=MessageDlg(lisExtToolFailedToRunTool,
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13,
'Program '+Filename+' not found']
),
mtError,[mbCancel,mbAbort],0);
exit;
end;
Filename:=NewFilename;
end;
WorkingDir:=TrimFilename(WorkingDir); WorkingDir:=TrimFilename(WorkingDir);
Filename:=TrimFilename(Filename); Filename:=TrimFilename(Filename);
CmdLine:=Filename; CmdLine:=Filename;

4
packager/pkgmanager.pas
View File

@ -1299,7 +1299,7 @@ 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'; FPCMakeTool.Filename:='fpcmake'+GetDefaultExecutableExt;
FPCMakeTool.CmdLineParams:='-TAll'; FPCMakeTool.CmdLineParams:='-TAll';
FPCMakeTool.EnvironmentOverrides.Add( FPCMakeTool.EnvironmentOverrides.Add(
'FPCDIR='+EnvironmentOptions.FPCSourceDirectory); 'FPCDIR='+EnvironmentOptions.FPCSourceDirectory);
@ -1312,7 +1312,7 @@ begin
MainIDE.MacroList,nil,nil); MainIDE.MacroList,nil,nil);
if Result<>mrOk then begin if Result<>mrOk then begin
Result:=MessageDlg('fpcmake failed', Result:=MessageDlg('fpcmake failed',
'Calling fpcmake to create Makefile from ' 'Calling '+FPCMakeTool.Filename+' to create Makefile from '
+MakefileFPCFilename+' failed.', +MakefileFPCFilename+' failed.',
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;