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

* Added templates for fppkg configuration files

Browse Source 
git-svn-id: trunk@15193 -
This commit is contained in:
joost 2010-04-27 12:12:30 +00:00
parent 1834156acd
commit df92cfbcf0
8 changed files with 90 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -11314,6 +11314,8 @@ utils/fpcm/printmakefilefpcrequirements.sh svneol=native#text/plain
utils/fpcm/readme.txt svneol=native#text/plain
utils/fpcmkcfg/Makefile svneol=native#text/plain
utils/fpcmkcfg/Makefile.fpc svneol=native#text/plain
utils/fpcmkcfg/default.cft svneol=native#text/plain
utils/fpcmkcfg/default.inc svneol=native#text/plain
utils/fpcmkcfg/fpc.cft svneol=native#text/plain
utils/fpcmkcfg/fpccfg.inc svneol=native#text/plain
utils/fpcmkcfg/fpcfg.inc svneol=native#text/plain
@ -11321,6 +11323,8 @@ utils/fpcmkcfg/fpcmkcfg.pp svneol=native#text/plain
utils/fpcmkcfg/fpinc.cfg svneol=native#text/plain
utils/fpcmkcfg/fpinc.ini svneol=native#text/plain
utils/fpcmkcfg/fpini.inc svneol=native#text/plain
utils/fpcmkcfg/fppkg.cfg svneol=native#text/plain
utils/fpcmkcfg/fppkg.inc svneol=native#text/plain
utils/fpcres/Makefile svneol=native#text/plain
utils/fpcres/Makefile.fpc svneol=native#text/plain
utils/fpcres/closablefilestream.pas svneol=native#text/plain

4
utils/fpcmkcfg/Makefile
View File

@ -2096,4 +2096,8 @@ fpcfg.inc : fpinc.cfg
$(DATA2INC) -b -s fpinc.cfg fpcfg.inc fpcfg
fpini.inc : fpinc.ini
$(DATA2INC) -b -s fpinc.ini fpini.inc fpini
fppkg.inc : fppkg.cfg
$(DATA2INC) -b -s fppkg.cfg fppkg.inc fppkg
default.inc : default.cft
$(DATA2INC) -b -s default.cft default.inc fppkg_default
endif

7
utils/fpcmkcfg/Makefile.fpc
View File

@ -40,5 +40,12 @@ fpcfg.inc : fpinc.cfg
fpini.inc : fpinc.ini
$(DATA2INC) -b -s fpinc.ini fpini.inc fpini
fppkg.inc : fppkg.cfg
$(DATA2INC) -b -s fppkg.cfg fppkg.inc fppkg
default.inc : default.cft
$(DATA2INC) -b -s default.cft default.inc fppkg_default
endif

8
utils/fpcmkcfg/default.cft Normal file
View File

@ -0,0 +1,8 @@
[Defaults]
ConfigVersion=4
GlobalInstallDir=%basepath%
LocalInstallDir={LocalRepository}lib/%fpcversion%/
Compiler=%fpcbin%
OS=%fpctargetos%
CPU=%fpctarget%
Version=%fpcversion%

14
utils/fpcmkcfg/default.inc Normal file
View File

@ -0,0 +1,14 @@
{$ifdef Delphi}
const fppkg_default : array[0..0] of string[240]=(
{$else Delphi}
const fppkg_default : array[0..0,1..240] of char=(
{$endif Delphi}
'[Defaults]'#010+
'ConfigVersion=4'#010+
'GlobalInstallDir=%basepath%'#010+
'LocalInstallDir={LocalRepository}lib/%fpcversion%/'#010+
'Compiler=%fpcbin%'#010+
'OS=%fpctargetos%'#010+
'CPU=%fpctarget%'#010+
'Version=%fpcversion%'#010
);

25
utils/fpcmkcfg/fpcmkcfg.pp
View File

@ -24,11 +24,15 @@ uses SysUtils,Classes,fpTemplate;
data2inc -b -s fpc.cft fpccfg.inc DefaultConfig
data2inc -b -s fpinc.ini fpini.inc fpini
data2inc -b -s fpinc.cfg fpcfg.inc fpcfg
data2inc -b -s fppkg.cfg fppkg.inc fppkg
data2inc -b -s default.cft default.inc fppkg_default
}
{$i fpccfg.inc}
{$i fpini.inc}
{$i fpcfg.inc}
{$i fppkg.inc}
{$i default.inc}
Const
BuildVersion={$I %FPCVERSION%};
@ -50,6 +54,8 @@ Resourcestring
Susage100 = ' -0 use built in fpc.cfg template (default)';
Susage110 = ' -1 use built in fp.cfg template';
Susage120 = ' -2 use built in fp.ini template';
Susage130 = ' -3 use built in fppkg.cfg template';
Susage140 = ' -4 use built in fppkg default compiler template';
SErrUnknownOption = 'Error: Unknown option.';
SErrArgExpected = 'Error: Option "%s" requires an argument.';
SErrIncompletePair = 'Error: Incomplete name-value pair "%s".';
@ -71,6 +77,15 @@ Var
OutputFileName : String;
IDEBuildin : Integer;
function GetDefaultLocalRepository: string;
begin
{$IFDEF Unix}
result := '{UserDir}.fppkg'+PathDelim;
{$ELSE Unix}
result := '{AppConfigDir}';
{$ENDIF Unix}
end;
procedure Init;
@ -88,6 +103,8 @@ begin
TemplateParser.Values['BUILDDATE'] := DateToStr(Date);
TemplateParser.Values['BUILDTIME'] := TimeToStr(Time);
TemplateParser.Values['LOCALREPOSITORY'] := GetDefaultLocalRepository;
Cfg:=TStringList.Create;
Cfg.Text:=StrPas(Addr(DefaultConfig[0][1]));
end;
@ -115,6 +132,8 @@ begin
Writeln(SUsage100);
Writeln(SUsage110);
Writeln(SUsage120);
Writeln(SUsage130);
Writeln(SUsage140);
Halt(1);
end;
@ -194,6 +213,8 @@ begin
'0' : IDEBuildin:=0;
'1' : IDEBuildin:=1;
'2' : IDEBuildin:=2;
'3' : IDEBuildin:=3;
'4' : IDEBuildin:=4;
else
UnknownOption(S);
end;
@ -216,6 +237,10 @@ begin
Cfg.Text:=StrPas(Addr(fpcfg[0][1]));
2:
Cfg.Text:=StrPas(Addr(fpini[0][1]));
3:
Cfg.Text:=StrPas(Addr(fppkg[0][1]));
4:
Cfg.Text:=StrPas(Addr(fppkg_default[0][1]));
end;
TemplateParser.Values['TEMPLATEFILE'] := 'builtin';

11
utils/fpcmkcfg/fppkg.cfg Normal file
View File

@ -0,0 +1,11 @@
[Defaults]
ConfigVersion=4
LocalRepository=%LocalRepository%
BuildDir={LocalRepository}build/
ArchivesDir={LocalRepository}archives/
CompilerConfigDir={LocalRepository}config/
RemoteMirrors=http://www.freepascal.org/repository/mirrors.xml
RemoteRepository=auto
CompilerConfig=default
FPMakeCompilerConfig=default
Downloader=lnet

17
utils/fpcmkcfg/fppkg.inc Normal file
View File

@ -0,0 +1,17 @@
{$ifdef Delphi}
const fppkg : array[0..1] of string[240]=(
{$else Delphi}
const fppkg : array[0..1,1..240] of char=(
{$endif Delphi}
'[Defaults]'#010+
'ConfigVersion=4'#010+
'LocalRepository=%LocalRepository%'#010+
'BuildDir={LocalRepository}build/'#010+
'ArchivesDir={LocalRepository}archives/'#010+
'CompilerConfigDir={LocalRepository}config/'#010+
'RemoteMirrors=http://www.freepascal.org/repository/mirrors.xml'#010+
'R','emoteRepository=auto'#010+
'CompilerConfig=default'#010+
'FPMakeCompilerConfig=default'#010+
'Downloader=lnet'#010
);