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

ide: don't show warning is project path contains spaces (issue #0014478)

Browse Source 
git-svn-id: trunk@21658 -
This commit is contained in:
paul 2009-09-12 07:58:06 +00:00
parent 5f5e0ff648
commit f5264eb600
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ide/checkcompileropts.pas
View File

@ -118,7 +118,6 @@ var
type
TCCOSpecialCharType = (
ccoscSpaces,
ccoscNonASCII,
ccoscWrongPathDelim,
ccoscUnusualChars,
@ -139,15 +138,15 @@ procedure FindSpecialCharsInPath(const Path: string; out
var
i: Integer;
begin
HasChars:=[];
for i:=1 to length(Path) do begin
HasChars := [];
for i := 1 to length(Path) do
begin
case Path[i] of
#10,#13: Include(HasChars,ccoscNewLine);
#0..#8,#11,#12,#14..#31: Include(HasChars,ccoscSpecialChars);
#9,' ': Include(HasChars,ccoscSpaces);
'/','\': if Path[i]<>PathDelim then Include(HasChars,ccoscWrongPathDelim);
'@','#','$','&','*','(',')','[',']','+','~','<','>','?','|': Include(HasChars,ccoscUnusualChars);
#128..#255: Include(HasChars,ccoscNonASCII);
#10,#13: Include(HasChars,ccoscNewLine);
#0..#9,#11,#12,#14..#31: Include(HasChars,ccoscSpecialChars);
'/','\': if Path[i]<>PathDelim then Include(HasChars,ccoscWrongPathDelim);
'@','#','$','&','*','(',')','[',']','+','~','<','>','?','|': Include(HasChars,ccoscUnusualChars);
#128..#255: Include(HasChars,ccoscNonASCII);
end;
end;
end;
@ -165,7 +164,6 @@ function SpecialCharsToStr(const HasChars: TCCOSpecialChars): string;
begin
Result:='';
if ccoscSpaces in HasChars then AddStr(Result,lisCCOSpaces);
if ccoscNonASCII in HasChars then AddStr(Result,lisCCONonASCII);
if ccoscWrongPathDelim in HasChars then AddStr(Result,lisCCOWrongPathDelimiter);
if ccoscUnusualChars in HasChars then AddStr(Result,lisCCOUnusualChars);
@ -219,21 +217,22 @@ var
ErrorMsg: String;
HasChars: TCCOSpecialChars;
begin
FindSpecialCharsInPath(ExpandedPath,HasChars);
Warning:=SpecialCharsToStr(HasChars*[ccoscSpaces,ccoscNonASCII,
ccoscWrongPathDelim,ccoscUnusualChars]);
ErrorMsg:=SpecialCharsToStr(HasChars*[ccoscSpecialChars,ccoscNewLine]);
FindSpecialCharsInPath(ExpandedPath, HasChars);
Warning := SpecialCharsToStr(HasChars * [ccoscNonASCII, ccoscWrongPathDelim, ccoscUnusualChars]);
ErrorMsg := SpecialCharsToStr(HasChars * [ccoscSpecialChars, ccoscNewLine]);
if Warning<>'' then
AddWarning(Title+' '+Warning);
if ErrorMsg<>'' then begin
Result:=QuestionDlg(lisCCOInvalidSearchPath,Title+' '+ErrorMsg,mtError,
[mrIgnore,lisCCOSkip,mrAbort],0);
end else begin
if Warning='' then
Result:=mrOk
if Warning <> '' then
AddWarning(Title + ' ' + Warning);
if ErrorMsg <> '' then
begin
Result := QuestionDlg(lisCCOInvalidSearchPath, Title + ' ' + ErrorMsg, mtError,
[mrIgnore, lisCCOSkip, mrAbort], 0);
end else
begin
if Warning = '' then
Result := mrOk
else
Result:=mrIgnore;
Result := mrIgnore;
end;
end;

1
ide/lazarusidestrconsts.pas
View File

@ -1633,7 +1633,6 @@ resourcestring
dlgCCOResults = 'Results';
lisCCOCopyOutputToCliboard = 'Copy output to clipboard';
lisCCOContains = 'contains ';
lisCCOSpaces = 'spaces';
lisCCOSpecialCharacters = 'special characters';
lisCCONonASCII = 'non ASCII';
lisCCOWrongPathDelimiter = 'wrong path delimiter';