paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 10:16:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazBuild: Fix the logic for case insensitive long options. Issue #40217.

Browse Source
This commit is contained in:
Juha 2023-04-21 11:00:59 +03:00
parent a82f0d4e39
commit 3e977099f1
1 changed files with 68 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
ide/lazbuild.lpr
View File

@ -79,6 +79,9 @@ type
FSkipDependencies: boolean; FSkipDependencies: boolean;
fWidgetsetOverride: String; fWidgetsetOverride: String;
function HasLongOptIgnoreCase(const S: String; out aValue: String): Boolean;
function HasShortOrLongOpt(const C: Char; const S: String): Boolean;
// codetools // codetools
procedure OnCodeBufferDecodeLoaded({%H-}Code: TCodeBuffer; procedure OnCodeBufferDecodeLoaded({%H-}Code: TCodeBuffer;
const {%H-}Filename: string; var Source, DiskEncoding, MemEncoding: string); const {%H-}Filename: string; var Source, DiskEncoding, MemEncoding: string);
@ -167,8 +170,7 @@ type
property BuildIDE: boolean read FBuildIDE write FBuildIDE; // build IDE (as opposed to a project/package etc) property BuildIDE: boolean read FBuildIDE write FBuildIDE; // build IDE (as opposed to a project/package etc)
property BuildIDEOptions: string read FBuildIDEOptions write FBuildIDEOptions; property BuildIDEOptions: string read FBuildIDEOptions write FBuildIDEOptions;
property CreateMakefile: boolean read FCreateMakefile write FCreateMakefile; property CreateMakefile: boolean read FCreateMakefile write FCreateMakefile;
property WidgetSetOverride: String read fWidgetsetOverride property WidgetSetOverride: String read FWidgetsetOverride write FWidgetsetOverride;
write fWidgetsetOverride;
property OSOverride: String read fOSOverride write fOSOverride; property OSOverride: String read fOSOverride write fOSOverride;
property CPUOverride: String read fCPUOverride write fCPUOverride; property CPUOverride: String read fCPUOverride write fCPUOverride;
property CompilerOverride: String read fCompilerOverride write fCompilerOverride; property CompilerOverride: String read fCompilerOverride write fCompilerOverride;
@ -1312,23 +1314,21 @@ end;
function TLazBuildApplication.RepairedCheckOptions(const ShortOptions: String; function TLazBuildApplication.RepairedCheckOptions(const ShortOptions: String;
const Longopts: TStrings; Opts, NonOpts: TStrings): String; const Longopts: TStrings; Opts, NonOpts: TStrings): String;
Function FindLongOpt(S : String) : boolean;
Var
I : integer;
begin
I:=LongOpts.Count-1;
While (I>=0) and (LongOpts[I]<>S) do
Dec(I);
Result:=(I<>-1);
end;
Var Var
I,J,L,P : Integer; I,J,L,P : Integer;
O,OV : String; O,OV : String;
HaveArg : Boolean; HaveArg : Boolean;
NeedArg: Boolean; NeedArg: Boolean;
Function FindLongOpt(S : String) : boolean;
Var
I : integer;
begin
S:=LowerCase(S);
I:=LongOpts.Count-1;
While (I>=0) and (LowerCase(LongOpts[i])<>S) do
Dec(i);
Result:=(I<>-1);
end;
begin begin
Result:=''; Result:='';
I:=1; I:=1;
@ -1360,6 +1360,7 @@ begin
Delete(OV,1,J); Delete(OV,1,J);
O:=Copy(O,1,J-1); O:=Copy(O,1,J-1);
end; end;
O:=LowerCase(O); // Long options are case-insensitive.
// Switch Option // Switch Option
If FindLongopt(O) then If FindLongopt(O) then
begin begin
@ -1500,17 +1501,37 @@ begin
end; end;
end; end;
Function TLazBuildApplication.HasLongOptIgnoreCase(const S: String; out aValue: String): Boolean;
// Check existence of a long option case-insensitively.
begin
CaseSensitiveOptions:=False;
Result:=HasOption(S);
if Result then
aValue:=GetOptionValue(S)
else
aValue:='';
CaseSensitiveOptions:=True;
end;
Function TLazBuildApplication.HasShortOrLongOpt(const C: Char; const S: String): Boolean;
// Check existence of a short option casesensitively and long option case-insensitively.
begin
Result:=HasOption(C);
CaseSensitiveOptions:=False;
Result:=Result or HasOption(S);
CaseSensitiveOptions:=True;
end;
function TLazBuildApplication.ParseParameters: boolean; function TLazBuildApplication.ParseParameters: boolean;
var var
Options: TStringList; Options: TStringList;
NonOptions: TStringList; NonOptions: TStringList;
ErrorMsg: String;
LongOptions: TStringList; LongOptions: TStringList;
i: Integer; i: Integer;
p: String; p, ErrorMsg: String;
FilesNeeded: Boolean; FilesNeeded: Boolean;
begin begin
Result:=false; Result:=False;
if (ToolParamCount<=0) if (ToolParamCount<=0)
or (CompareText(ToolParamStr(1),'--help')=0) or (CompareText(ToolParamStr(1),'--help')=0)
or (CompareText(ToolParamStr(1),'-help')=0) or (CompareText(ToolParamStr(1),'-help')=0)
@ -1520,11 +1541,11 @@ begin
WriteUsage; WriteUsage;
exit; exit;
end; end;
if HasOption('h','help') or HasOption('?') then begin if HasShortOrLongOpt('h','help') or HasOption('?') then begin
WriteUsage; WriteUsage;
exit; exit;
end; end;
if HasOption('v','version') then begin if HasShortOrLongOpt('v','version') then begin
writeln(VersionStr); writeln(VersionStr);
exit; exit;
end; end;
@ -1578,11 +1599,11 @@ begin
FilesNeeded:=true; FilesNeeded:=true;
if HasOption('verbose-pkgsearch') then if HasLongOptIgnoreCase('verbose-pkgsearch',p) then
Include(fPkgGraphVerbosity,pvPkgSearch); Include(fPkgGraphVerbosity,pvPkgSearch);
// PackageAction: register lpk files // PackageAction: register lpk files
if HasOption('add-package-link') then begin if HasLongOptIgnoreCase('add-package-link',p) then begin
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: add-package-link'); writeln('Parameter: add-package-link');
if PackageAction<>lpaBuild then begin if PackageAction<>lpaBuild then begin
@ -1595,7 +1616,7 @@ begin
end; end;
// PackageAction: install lpk files // PackageAction: install lpk files
if HasOption('add-package') then begin if HasLongOptIgnoreCase('add-package',p) then begin
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: add-package'); writeln('Parameter: add-package');
if PackageAction<>lpaBuild then begin if PackageAction<>lpaBuild then begin
@ -1608,9 +1629,8 @@ begin
end; end;
// building IDE // building IDE
if HasOption('build-ide') then begin if HasLongOptIgnoreCase('build-ide', FBuildIDEOptions) then begin
BuildIDE:=true; BuildIDE:=true;
BuildIDEOptions:=GetOptionValue('build-ide');
FilesNeeded:=false; FilesNeeded:=false;
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: build-ide=',BuildIDEOptions); writeln('Parameter: build-ide=',BuildIDEOptions);
@ -1625,40 +1645,40 @@ begin
end; end;
// primary config path // primary config path
if HasOption('primary-config-path') then begin if HasLongOptIgnoreCase('primary-config-path',p) then begin
SetPrimaryConfigPath(GetOptionValue('primary-config-path')); SetPrimaryConfigPath(p);
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: primary-config-path=',GetPrimaryConfigPath); writeln('Parameter: primary-config-path=',GetPrimaryConfigPath);
end else if HasOption('pcp') then begin end else if HasLongOptIgnoreCase('pcp',p) then begin
SetPrimaryConfigPath(GetOptionValue('pcp')); SetPrimaryConfigPath(p);
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: pcp=',GetPrimaryConfigPath); writeln('Parameter: pcp=',GetPrimaryConfigPath);
end; end;
// secondary config path // secondary config path
if HasOption('secondary-config-path') then begin if HasLongOptIgnoreCase('secondary-config-path',p) then begin
SetPrimaryConfigPath(GetOptionValue('secondary-config-path')); SetPrimaryConfigPath(p);
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: secondary-config-path=',GetSecondaryConfigPath); writeln('Parameter: secondary-config-path=',GetSecondaryConfigPath);
end else if HasOption('scp') then begin end else if HasLongOptIgnoreCase('scp',p) then begin
SetSecondaryConfigPath(GetOptionValue('scp')); SetSecondaryConfigPath(p);
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: scp=',GetSecondaryConfigPath); writeln('Parameter: scp=',GetSecondaryConfigPath);
end; end;
// build all // build all
if HasOption('B','build-all') then begin if HasShortOrLongOpt('B','build-all') then begin
BuildAll:=true; BuildAll:=true;
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: build-all'); writeln('Parameter: build-all');
end; end;
if HasOption('r','recursive') then begin if HasShortOrLongOpt('r','recursive') then begin
BuildAll:=true; BuildAll:=true;
BuildRecursive:=true; BuildRecursive:=true;
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: recursive'); writeln('Parameter: recursive');
end; end;
if HasOption('d','skip-dependencies') then begin if HasShortOrLongOpt('d','skip-dependencies') then begin
SkipDependencies:=true; SkipDependencies:=true;
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: skip-dependencies'); writeln('Parameter: skip-dependencies');
@ -1671,74 +1691,65 @@ begin
// overides // overides
// widgetset // widgetset
if HasOption('ws') then begin if HasLongOptIgnoreCase('ws',FWidgetSetOverride) then begin
WidgetSetOverride := GetOptionValue('ws');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: ws=',WidgetSetOverride); writeln('Parameter: ws=',WidgetSetOverride);
end else if HasOption('widgetset') then begin end else if HasLongOptIgnoreCase('widgetset',FWidgetSetOverride) then begin
WidgetSetOverride := GetOptionValue('widgetset');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: widgetset=',WidgetSetOverride); writeln('Parameter: widgetset=',WidgetSetOverride);
end; end;
// operating system // operating system
if HasOption('os') then begin if HasLongOptIgnoreCase('os',FOSOverride) then begin
OSOverride := GetOptionValue('os');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: os=',OSOverride); writeln('Parameter: os=',OSOverride);
end else if HasOption('operating-system') then begin end else if HasLongOptIgnoreCase('operating-system',FOSOverride) then begin
OSOverride := GetOptionValue('operating-system');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: operating-system=',OSOverride); writeln('Parameter: operating-system=',OSOverride);
end; end;
// cpu // cpu
if HasOption('cpu') then begin if HasLongOptIgnoreCase('cpu',FCPUOverride) then begin
CPUOverride := GetOptionValue('cpu');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: cpu=',CPUOverride); writeln('Parameter: cpu=',CPUOverride);
end; end;
// build mode // build mode
if HasOption('bm') then begin if HasLongOptIgnoreCase('bm',FBuildModeOverride) then begin
BuildModeOverride := GetOptionValue('bm');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: bm=',BuildModeOverride); writeln('Parameter: bm=',BuildModeOverride);
end else if HasOption('build-mode') then begin end else if HasLongOptIgnoreCase('build-mode',FBuildModeOverride) then begin
BuildModeOverride := GetOptionValue('build-mode');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: build-mode=',BuildModeOverride); writeln('Parameter: build-mode=',BuildModeOverride);
end; end;
// compiler // compiler
if HasOption('compiler') then begin if HasLongOptIgnoreCase('compiler',FCompilerOverride) then begin
CompilerOverride := GetOptionValue('compiler');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: compiler=',CompilerOverride); writeln('Parameter: compiler=',CompilerOverride);
end; end;
// lazarusdir // lazarusdir
if HasOption('lazarusdir') then begin if HasLongOptIgnoreCase('lazarusdir',FLazarusDirOverride) then begin
LazarusDirOverride := GetOptionValue('lazarusdir');
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: lazarusdir=',LazarusDirOverride); writeln('Parameter: lazarusdir=',LazarusDirOverride);
end; end;
// max-process-count // max-process-count
if HasOption('max-process-count') then begin if HasLongOptIgnoreCase('max-process-count',p) then begin
MaxProcessCount:=StrToInt(GetOptionValue('max-process-count')); MaxProcessCount:=StrToInt(p);
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: max-process-count=',MaxProcessCount); writeln('Parameter: max-process-count=',MaxProcessCount);
end; end;
if HasOption('no-write-project') then if HasLongOptIgnoreCase('no-write-project',p) then
begin begin
NoWriteProject := true; NoWriteProject := true;
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then
writeln('Parameter: no-write-project'); writeln('Parameter: no-write-project');
end; end;
if HasOption('create-makefile') then if HasLongOptIgnoreCase('create-makefile',p) then
begin begin
CreateMakefile := true; CreateMakefile := true;
if ConsoleVerbosity>=0 then if ConsoleVerbosity>=0 then