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

* separate compiler setting for compiling fpmake.pp

Browse Source 
* first auto-detected fpc is used for compiling fpmake.pp

git-svn-id: trunk@6567 -
This commit is contained in:
peter 2007-02-19 22:20:43 +00:00
parent c9a2067b61
commit 7fa93d8b1a
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/fppkg/fppkg.pp
View File

@ -297,8 +297,8 @@ var
Args : TActionArgs;
OldCurrDir : String;
begin
LoadGlobalDefaults;
OldCurrDir:=GetCurrentDir;
LoadGlobalDefaults;
Try
ProcessCommandLine;
MaybeCreateLocalDirs;

8
utils/fppkg/pkgfpmake.pp
View File

@ -76,8 +76,8 @@ begin
if Not HaveFPMake then
Error(SErrMissingFPMake);
{ Call compiler }
C:=Defaults.Compiler;
O:=FPmakeSrc;
C:=Defaults.FPMakeCompiler;
O:='-vi -n -Fu'+Defaults.FPMakeUnitDir+' -Fu'+Defaults.FPMakeUnitDir+'..'+PathDelim+'rtl'+PathDelim+' '+FPmakeSrc;
If ExecuteProcess(C,O)<>0 then
Error(SErrFailedToCompileFPCMake)
end
@ -112,14 +112,14 @@ end;
function TFPMakeRunnerBuild.Execute(const Args:TActionArgs):boolean;
begin
result:=(RunFPMake('--build')=0);
result:=(RunFPMake('build')=0);
end;
function TFPMakeRunnerInstall.Execute(const Args:TActionArgs):boolean;
begin
result:=(RunFPMake('--install')=0);
result:=(RunFPMake('install')=0);
end;

25
utils/fppkg/pkgoptions.pp
View File

@ -41,6 +41,9 @@ Type
FCompilerOS: TOS;
FCompilerVersion : String;
FInstallDir : String;
// Compiler settings for compiling FPMake.pp
FFPMakeCompiler : String;
FFPMakeUnitDir : String;
function GetOptString(Index: integer): String;
procedure SetOptString(Index: integer; const AValue: String);
procedure SetCompilerCPU(const AValue: TCPU);
@ -75,6 +78,8 @@ Type
Property DefaultVerbosity : String Index 11 Read GetOptString Write SetOptString;
Property PackagesDir : String Index 12 Read GetOptString Write SetOptString;
Property CompilerConfigDir : String Index 13 Read GetOptString Write SetOptString;
Property FPMakeCompiler : String Index 14 Read GetOptString Write SetOptString;
Property FPMakeUnitDir : String Index 15 Read GetOptString Write SetOptString;
Property CompilerOS : TOS Read FCompilerOS Write SetCompilerOS;
Property CompilerCPU : TCPU Read FCompilerCPU Write SetCompilerCPU;
end;
@ -122,6 +127,8 @@ Const
KeyCompilerOS = 'OS';
KeyCompilerCPU = 'CPU';
KeyCompilerVersion = 'Version';
KeyFPMakeCompiler = 'FPMakeCompiler';
KeyFPMakeUnitDir = 'FPMakeUnitDir';
{ TPackagerOptions }
@ -148,6 +155,8 @@ begin
11 : Result:=FDefaultVerbosity;
12 : Result:=FPackagesDir;
13 : Result:=FCompilerConfigDir;
14 : Result:=FFPMakeCompiler;
15 : Result:=FFPMakeUnitDir;
end;
end;
@ -169,6 +178,8 @@ begin
11 : FDefaultVerbosity:=AValue;
12 : FPackagesDir:=FixPath(AValue);
13 : FCompilerConfigDir:=FixPath(AValue);
14 : FFPMakeCompiler:=AValue;
15 : FFPMakeUnitDir:=FixPath(AValue);
end;
FDirty:=True;
end;
@ -209,7 +220,6 @@ begin
Result:=FLocalRepository+Format(DefaultVersionsFile,[CompilerConfig]);
end;
Procedure TPackagerOptions.InitGlobalDefaults;
var
LocalDir : String;
@ -258,9 +268,9 @@ begin
FInstallDir:=FixPath(GetEnvironmentVariable('FPCDIR'));
if FInstallDir='' then
begin
if DirectoryExists('/usr/local/lib/fpc/'+FCompilerVersion) then
FInstallDir:='/usr/local/lib/fpc/'+FCompilerVersion+'/'
else
FInstallDir:='/usr/local/lib/fpc/'+FCompilerVersion+'/';
if not DirectoryExists(FInstallDir) and
DirectoryExists('/usr/lib/fpc/'+FCompilerVersion) then
FInstallDir:='/usr/lib/fpc/'+FCompilerVersion+'/';
end;
{$else unix}
@ -273,6 +283,9 @@ begin
FInstallDir:=FInstallDir+'../';
end;
{$endif unix}
// Detect directory where fpmake units are located
FFPMakeCompiler:=FCompiler;
FFPMakeUnitDir:=FInstallDir+'units'+PathDelim+CompilerTarget+PathDelim+'fpmake'+PathDelim;
end;
@ -346,6 +359,8 @@ begin
FCompilerOS:=StringToOS(ReadString(SDefaults,KeyCompilerOS,OSToString(CompilerOS)));
FCompilerCPU:=StringToCPU(ReadString(SDefaults,KeyCompilerCPU,CPUtoString(CompilerCPU)));
FCompilerVersion:=ReadString(SDefaults,KeyCompilerVersion,FCompilerVersion);
FFPMakeCompiler:=ReadString(SDefaults,KeyFPMakeCompiler,FFPMakeCompiler);
FFPMakeUnitDir:=FixPath(ReadString(SDefaults,KeyFPMakeUnitDir,FFPMakeUnitDir));
end;
end;
@ -359,6 +374,8 @@ begin
WriteString(SDefaults,KeyCompilerOS,OSToString(CompilerOS));
WriteString(SDefaults,KeyCompilerCPU,CPUtoString(CompilerCPU));
WriteString(SDefaults,KeyCompilerVersion,FCompilerVersion);
WriteString(SDefaults,KeyFPMakeCompiler,FFPMakeCompiler);
WriteString(SDefaults,KeyFPMakeUnitDir,FFPMakeUnitDir);
end;
end;