* Fixed fppkg --config-file option

git-svn-id: trunk@32071 -
This commit is contained in:
joost 2015-10-17 13:39:29 +00:00
parent 4c8fc04a24
commit 57204b2404

View File

@ -82,6 +82,7 @@ procedure TMakeTool.ShowUsage;
begin begin
Writeln('Usage: ',Paramstr(0),' [options] <action> <package>'); Writeln('Usage: ',Paramstr(0),' [options] <action> <package>');
Writeln('Options:'); Writeln('Options:');
Writeln(' -C --config-file Specify the configuration file to use');
Writeln(' -c --config Set compiler configuration to use'); Writeln(' -c --config Set compiler configuration to use');
Writeln(' -h --help This help'); Writeln(' -h --help This help');
Writeln(' -v --verbose Show more information'); Writeln(' -v --verbose Show more information');
@ -195,7 +196,12 @@ begin
begin begin
Inc(I); Inc(I);
// Check options. // Check options.
if CheckOption(I,'c','config') then if CheckOption(I,'C','config-file') then
begin
// Do nothing, the config-file has already been read.
OptionArg(I);
end
else if CheckOption(I,'c','config') then
GlobalOptions.CompilerConfig:=OptionArg(I) GlobalOptions.CompilerConfig:=OptionArg(I)
else if CheckOption(I,'v','verbose') then else if CheckOption(I,'v','verbose') then
LogLevels:=AllLogLevels LogLevels:=AllLogLevels