paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 12:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* update convertmk to generate a valid fpmake.pp

Browse Source 
* never overwrite existing fpmake.pp

git-svn-id: trunk@9938 -
This commit is contained in:
peter 2008-01-26 16:39:28 +00:00
parent 8c4f806231
commit 71688e72ef
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
utils/fppkg/pkgmessages.pp
View File

@ -39,6 +39,7 @@ Resourcestring
SErrChangeDirFailed = 'Could not change directory to "%s"'; SErrChangeDirFailed = 'Could not change directory to "%s"';
SErrCorruptPackagesFile = 'Packages file "%s" is corrupt, delete file manual and retry'; SErrCorruptPackagesFile = 'Packages file "%s" is corrupt, delete file manual and retry';
SErrPackageIsLocal = 'Operation not supported for local packages'; SErrPackageIsLocal = 'Operation not supported for local packages';
SErrConvertFPMakeExists = 'Found existing fpmake.pp, aborting conversion';
SErrHTTPGetFailed = 'HTTP Download failed.'; SErrHTTPGetFailed = 'HTTP Download failed.';
SErrLoginFailed = 'FTP LOGIN command failed.'; SErrLoginFailed = 'FTP LOGIN command failed.';

25
utils/fppkg/pkgmkconv.pp
View File

@ -126,6 +126,7 @@ begin
Add('uses fpmkunit;'); Add('uses fpmkunit;');
Add(''); Add('');
Add('Var'); Add('Var');
Add(' P : TPackage;');
Add(' T : TTarget;'); Add(' T : TTarget;');
Add(''); Add('');
Add('begin'); Add('begin');
@ -204,21 +205,21 @@ begin
Add(' { '); Add(' { ');
Add(' '+FPackageName); Add(' '+FPackageName);
Add(' } '); Add(' } ');
Add(' StartPackage('''+FPackageName+''');'); Add(' P:=AddPackage('''+FPackageName+''');');
If (Dir<>'') then If (Dir<>'') then
Add(' Directory:='''+ExcludeTrailingPathDelimiter(Dir)+''';'); Add(' P.Directory:='''+ExcludeTrailingPathDelimiter(Dir)+''';');
If (OS<>'') and (OS<>'all') then If (OS<>'') and (OS<>'all') then
Add(' OS:=['+OS+'];'); Add(' P.OS:=['+OS+'];');
If (FPackageVersion<>'') then If (FPackageVersion<>'') then
Add(' Version:='''+FPackageVersion+''';'); Add(' P.Version:='''+FPackageVersion+''';');
If (FPackageOptions<>'') then If (FPackageOptions<>'') then
Add(' Options:='''+FPackageOptions+''';'); Add(' P.Options:='''+FPackageOptions+''';');
If (FPackageDeps<>'') then If (FPackageDeps<>'') then
begin begin
S:=GetWord(FPackageDeps); S:=GetWord(FPackageDeps);
While S<>'' do While S<>'' do
begin begin
Add(' Dependencies.Add('''+S+''');'); Add(' P.Dependencies.Add('''+S+''');');
S:=GetWord(FPackageDeps); S:=GetWord(FPackageDeps);
end; end;
end; end;
@ -228,7 +229,6 @@ end;
procedure TMakeFileConverter.EndPackage(Src : TStrings; Dir,OS : String); procedure TMakeFileConverter.EndPackage(Src : TStrings; Dir,OS : String);
begin begin
Src.add(' EndPackage;');
FPackageName:=''; FPackageName:='';
FPackageVersion:=''; FPackageVersion:='';
FPackageOptions:=''; FPackageOptions:='';
@ -502,7 +502,7 @@ begin
Res:=R.IndexOfName(N)<>-1; Res:=R.IndexOfName(N)<>-1;
GetOSCPU(V,OS,CPU); GetOSCPU(V,OS,CPU);
Pre[1]:=Upcase(Pre[1]); Pre[1]:=Upcase(Pre[1]);
Src.Add(' T:=Targets.Add'+Pre+'('''+Prefix+N+''');'); Src.Add(' T:=P.Targets.Add'+Pre+'('''+Prefix+N+''');');
If (CPU<>'') then If (CPU<>'') then
Src.Add(' T.CPU:=['+CPU+'];'); Src.Add(' T.CPU:=['+CPU+'];');
If (OS<>'') then If (OS<>'') then
@ -553,7 +553,7 @@ begin
IFL.GetNamevalue(I,N,V); IFL.GetNamevalue(I,N,V);
GetOSCPU(V,OS,CPU); GetOSCPU(V,OS,CPU);
WriteOSCPUCheck(Src,OS,CPU); WriteOSCPUCheck(Src,OS,CPU);
Src.add(' InstallFiles.Add('''+N+''');'); Src.add(' P.InstallFiles.Add('''+N+''');');
end; end;
end; end;
@ -571,7 +571,7 @@ begin
CFL.GetNamevalue(I,N,V); CFL.GetNamevalue(I,N,V);
GetOSCPU(V,OS,CPU); GetOSCPU(V,OS,CPU);
WriteOSCPUCheck(Src,OS,CPU); WriteOSCPUCheck(Src,OS,CPU);
Src.add(' CleanFiles.Add('''+N+''');'); Src.add(' P.CleanFiles.Add('''+N+''');');
end; end;
end; end;
@ -698,7 +698,10 @@ end;
function TMakeFileConverter.Execute(const Args:TActionArgs):boolean; function TMakeFileConverter.Execute(const Args:TActionArgs):boolean;
begin begin
ConvertFile('Makefile.fpc','fpmake.pp'); if not FileExists('fpmake.pp') then
ConvertFile('Makefile.fpc','fpmake.pp')
else
Error(SErrConvertFPMakeExists);
result:=true; result:=true;
end; end;