LazBuild: Improve case sensitivity of options. From n7800.

This commit is contained in:
Juha 2024-03-12 08:03:10 +02:00
parent 2cf13d8ba4
commit 69a432d864

View File

@ -798,15 +798,14 @@ var
// apply options // apply options
MainBuildBoss.SetBuildTargetProject1(true,smsfsSkip); MainBuildBoss.SetBuildTargetProject1(true,smsfsSkip);
if HasOption('get-expand-text') then begin if HasLongOptIgnoreCase('get-expand-text',S) then begin
S:=GetOptionValue('get-expand-text');
Project1.MacroEngine.SubstituteStr(S); Project1.MacroEngine.SubstituteStr(S);
WriteLn(S); WriteLn(S);
exit(true); exit(true);
end; end;
TargetExeName := Project1.CompilerOptions.CreateTargetFilename; TargetExeName := Project1.CompilerOptions.CreateTargetFilename;
if HasOption('get-target-path') then begin if HasLongOptIgnoreCase('get-target-path',S) then begin
WriteLn(TargetExeName); WriteLn(TargetExeName);
exit(true); exit(true);
end; end;
@ -941,6 +940,7 @@ var
i, MatchCount: Integer; i, MatchCount: Integer;
ModeMask: TMask; ModeMask: TMask;
CurResult: Boolean; CurResult: Boolean;
S: string;
begin begin
Result:=false; Result:=false;
CloseProject(Project1); CloseProject(Project1);
@ -957,7 +957,7 @@ begin
else else
CompReason:= crCompile; CompReason:= crCompile;
if HasOption('get-build-modes') then begin if HasLongOptIgnoreCase('get-build-modes',S) then begin
ShowBuildModes; ShowBuildModes;
exit(true); exit(true);
end; end;
@ -1188,15 +1188,15 @@ end;
procedure TLazBuildApplication.LoadEnvironmentOptions; procedure TLazBuildApplication.LoadEnvironmentOptions;
var var
Note: string; Note, Lang: string;
begin begin
EnvironmentOptions.CreateConfig; EnvironmentOptions.CreateConfig;
EnvironmentOptions.Load(false); EnvironmentOptions.Load(false);
fCompilerInCfg:=EnvironmentOptions.CompilerFilename; fCompilerInCfg:=EnvironmentOptions.CompilerFilename;
fLazarusDirInCfg:=EnvironmentOptions.LazarusDirectory; fLazarusDirInCfg:=EnvironmentOptions.LazarusDirectory;
if HasOption('language') then if HasLongOptIgnoreCase('language',Lang) then
EnvironmentOptions.LanguageID:=GetOptionValue('language'); EnvironmentOptions.LanguageID:=Lang;
TranslateResourceStrings(EnvironmentOptions.GetParsedLazarusDirectory, TranslateResourceStrings(EnvironmentOptions.GetParsedLazarusDirectory,
EnvironmentOptions.LanguageID); EnvironmentOptions.LanguageID);
if CompilerOverride<>'' then if CompilerOverride<>'' then
@ -1731,8 +1731,7 @@ const
end; end;
begin begin
if LazBuildApp.HasOption('language') then if HasLongOptIgnoreCase('language',CustomLang) then
CustomLang:=LazBuildApp.GetOptionValue('language');
TranslateResourceStrings(ProgramDirectoryWithBundle,CustomLang); TranslateResourceStrings(ProgramDirectoryWithBundle,CustomLang);
writeln(''); writeln('');
writeln(lisLazbuildOptionsSyntax); writeln(lisLazbuildOptionsSyntax);