paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-03 12:18:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'IdeConfig/GetSkipCheckByKey' into 'main'

Browse Source 
IdeConfig: Always check the skcAll key in GetSkipCheckByKey function

See merge request freepascal.org/lazarus/lazarus!446
This commit is contained in:
Maxim Ganetsky 2025-03-05 22:40:24 +03:00
commit 83bb987de7
5 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/macroscript/registerems.pas
View File

@ -31,7 +31,7 @@ begin
if not EMSSupported then {%H-}exit;
if not (GetSkipCheckByKey('MacroScript') or GetSkipCheckByKey('All')) then begin
if not GetSkipCheckByKey('MacroScript') then begin
conf := GetEMSConf;
try

2
ide/ideinstances.pas
View File

@ -743,7 +743,7 @@ var
I: Integer;
begin
FForceNewInstance := CheckParamsForForceNewInstanceOpt;
FSkipAllChecks := GetSkipCheck(skcUniqueInstance) or GetSkipCheck(skcAll);
FSkipAllChecks := GetSkipCheck(skcUniqueInstance);
//get cmd line filenames
FFilesToOpen := ExtractCmdLineFilenames;

4
ide/main.pp
View File

@ -1301,7 +1301,7 @@ begin
end;
end
else
if (not (GetSkipCheck(skcLastCalled) or GetSkipCheck(skcAll)) ) and
if (not GetSkipCheck(skcLastCalled)) and
(CompareFilenames(LastCalled,CurPrgName)<>0) and
(CompareFilenames(LastCalled,AltPrgName)<>0) and
(CompareFilenames(CurPrgName,AltPrgName)<>0) // we can NOT check, if we only have the path inside the PCP
@ -1434,7 +1434,7 @@ begin
ShowSetupDialog:=true;
{$ENDIF}
SkipAllTests := GetSkipCheck(skcSetup) or GetSkipCheck(skcAll);
SkipAllTests := GetSkipCheck(skcSetup);
// check lazarus directory
if (not ShowSetupDialog)

20
ide/packages/ideconfig/idecmdline.pas
View File

@ -289,24 +289,18 @@ end;
function GetSkipCheckByKey(AKey: String): Boolean;
var
i: integer;
AValue: string;
AAll, AValue: string;
begin
// return language specified in command line (empty string if no language specified)
Result := False;
AAll := ','+UpperCase(SkipChecksKeys[skcAll])+',';
AKey := ','+UpperCase(AKey)+',';
AValue := '';
i := 1;
while i <= ParamsAndCfgCount do
begin
if ParamIsOptionPlusValue(i, SkipChecksOptLong, AValue) = true then
for i := 1 to ParamsAndCfgCount do
if ParamIsOptionPlusValue(i, SkipChecksOptLong, AValue) then
begin
AValue := ','+UpperCase(AValue)+',';
Result := Pos(AKey, AValue) > 0;
if Result then
exit;
if Pos(AAll, AValue) > 0 then exit(true);
if Pos(AKey, AValue) > 0 then exit(true);
end;
inc(i);
end;
result := false;
end;
procedure ParseCommandLine(aCmdLineParams: TStrings; out IDEPid: Integer; out

2
packager/pkgmanager.pas
View File

@ -1538,7 +1538,7 @@ var
begin
StaticPackages:=LazarusPackageIntf.RegisteredPackages;
if StaticPackages=nil then exit;
Quiet:=GetSkipCheck(skcMissingPackageFile) or GetSkipCheck(skcAll);
Quiet:=GetSkipCheck(skcMissingPackageFile);
PackageGraph.AbortRegistration:=false;
// register components in Lazarus packages
for i:=0 to StaticPackages.Count-1 do begin