diff --git a/components/ideintf/compoptsintf.pas b/components/ideintf/compoptsintf.pas index cef3ea661f..86dbb60163 100644 --- a/components/ideintf/compoptsintf.pas +++ b/components/ideintf/compoptsintf.pas @@ -411,7 +411,7 @@ type property ShowWarn: Boolean read fShowWarn write SetShowWarn; // -vw property ShowNotes: Boolean read fShowNotes write SetShowNotes; // -vn property ShowHints: Boolean read fShowHints write SetShowHints; // -vh - property ShowGenInfo: Boolean read fShowGenInfo write SetShowGenInfo; // -vi + property ShowGenInfo: Boolean read fShowGenInfo write SetShowGenInfo; deprecated; // -vi, always needed to resolve filenames in fpc messages without path property ShowLineNum: Boolean read fShowLineNum write SetShowLineNum; // -vl property ShowAll: Boolean read fShowAll write SetShowAll; // -va property ShowDebugInfo: Boolean read fShowDebugInfo write SetShowDebugInfo; // -vd diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index 496dde2e49..beef46722c 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -1644,7 +1644,7 @@ begin ShowWarn := aXMLConfig.GetValue(p+'Verbosity/ShowWarn/Value', true); ShowNotes := aXMLConfig.GetValue(p+'Verbosity/ShowNotes/Value', true); ShowHints := aXMLConfig.GetValue(p+'Verbosity/ShowHints/Value', true); - ShowGenInfo := aXMLConfig.GetValue(p+'Verbosity/ShowGenInfo/Value', true); + ShowGenInfo {%H-}:= aXMLConfig.GetValue(p+'Verbosity/ShowGenInfo/Value', true); ShowLineNum := aXMLConfig.GetValue(p+'Verbosity/ShoLineNum/Value', false); ShowAll := aXMLConfig.GetValue(p+'Verbosity/ShowAll/Value', false); ShowDebugInfo := aXMLConfig.GetValue(p+'Verbosity/ShowDebugInfo/Value', false); @@ -1827,7 +1827,7 @@ begin aXMLConfig.SetDeleteValue(p+'Verbosity/ShowWarn/Value', ShowWarn,true); aXMLConfig.SetDeleteValue(p+'Verbosity/ShowNotes/Value', ShowNotes,true); aXMLConfig.SetDeleteValue(p+'Verbosity/ShowHints/Value', ShowHints,true); - aXMLConfig.SetDeleteValue(p+'Verbosity/ShowGenInfo/Value', ShowGenInfo,true); + aXMLConfig.SetDeleteValue(p+'Verbosity/ShowGenInfo/Value', ShowGenInfo{%H-},true); aXMLConfig.SetDeleteValue(p+'Verbosity/ShoLineNum/Value', ShowLineNum,false); aXMLConfig.SetDeleteValue(p+'Verbosity/ShowAll/Value', ShowAll,false); aXMLConfig.SetDeleteValue(p+'Verbosity/ShowDebugInfo/Value', ShowDebugInfo,false); @@ -2969,7 +2969,7 @@ begin EnableDisableVerbosityFlag(ShowWarn,'w'); EnableDisableVerbosityFlag(ShowNotes,'n'); EnableDisableVerbosityFlag(ShowHints,'h'); - EnableDisableVerbosityFlag(ShowGenInfo,'i'); + tempsw := tempsw + 'i'; // always pass -vi, needed to resolve filenames in fpc messages without path if ShowLineNum then tempsw := tempsw + 'l'; if ShowDebugInfo then @@ -2987,7 +2987,7 @@ begin if ShowAll or (ccloAddVerboseAll in Flags) then tempsw := 'a'; - tempsw := tempsw + 'bq'; // full file names and message ids + tempsw := tempsw + 'bq'; // b = full file names, q = message ids if (tempsw <> '') then begin tempsw := '-v' + tempsw; diff --git a/ide/frames/compiler_verbosity_options.pas b/ide/frames/compiler_verbosity_options.pas index 451b58d5f2..ea223c1246 100644 --- a/ide/frames/compiler_verbosity_options.pas +++ b/ide/frames/compiler_verbosity_options.pas @@ -50,7 +50,7 @@ begin Items.Add(dlgShowUsedFiles + ' (-vu)'); Items.Add(dlgShowHint + ' (-vh)'); Items.Add(dlgShowTriedFiles + ' (-vt)'); - Items.Add(dlgShowGeneralInfo + ' (-vi)'); + //Items.Add(dlgShowGeneralInfo + ' (-vi)'); always passed, see compileroptions.pp Items.Add(dlgShowCompilingLineNumbers + ' (-vl)'); Items.Add(dlgShowCompiledProcedures + ' (-vp)'); Items.Add(dlgShowConditionals + ' (-vc)'); @@ -80,7 +80,6 @@ begin Checked[i] := ShowUsedFiles; i+=1; Checked[i] := ShowHints; i+=1; Checked[i] := ShowTriedFiles; i+=1; - Checked[i] := ShowGenInfo; i+=1; Checked[i] := ShowLineNum; i+=1; Checked[i] := ShowCompProc; i+=1; Checked[i] := ShowCond; i+=1; @@ -109,8 +108,6 @@ begin ShowUsedFiles := Checked[i]; i+=1; ShowHints := Checked[i]; i+=1; ShowTriedFiles := Checked[i]; i+=1; - ShowGenInfo := Checked[i]; i+=1; - ShowLineNum := Checked[i]; i+=1; ShowCompProc := Checked[i]; i+=1; ShowCond := Checked[i]; i+=1; ShowAll := Checked[i]; i+=1;