Changeset 7 for trunk

Timestamp:

May 2, 2014, 10:29:24 AM (11 years ago)

Author:

chronos

Message:

• Fixed: More robust configuration loading.
• Added: Show absolute path in missing items in comparison.

Location:

trunk

Files:

• UFormMain.pas (modified) (2 diffs)
• UKConfig.pas (modified) (6 diffs)

trunk/UFormMain.pas

@@ -71 +71 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Config.LoadFromDir('/home/chronos/Stažené/linux-3.14.1', 'x86');
+  Config.LoadFromDir('/home/jha/Projekty/fpc/kernel_options/linux-3.0', 'x86');
   Reload;
 end;
@@ -141 +141 @@
     Config2 := TConfigMenu.Create;
     Config.TopNode.SaveToList(List1);
-    Config2.LoadFromDir('/home/chronos/Stažené/linux-3.12.18', 'x86');
+    Config2.LoadFromDir('/opt/elinos-D6.0/linux/linux-p4-3.0/', 'p4');
     Config2.TopNode.SaveToList(List2);
     Config.CompareStringLists(List1, List2, Missing1, Missing2);
+    Config2.OptionListNames(Missing1);
+    Config.OptionListNames(Missing2);
     FormCompare.Memo1.Lines.Assign(Missing1);
     FormCompare.Memo2.Lines.Assign(Missing2);

trunk/UKConfig.pas

@@ -1 +1 @@
 unit UKConfig;
+
+// Kconfig format specification:
+// https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt
 
 {$mode Delphi}{$H+}
@@ -73 +76 @@
     BaseDir: string;
     Version: string;
+    procedure OptionListNames(List: TStringList);
     procedure PrepareMoveList(var List: TObjectMoves);
     procedure CompareStringLists(List1, List2: TStringList; Missing1,
@@ -121 +125 @@
 function TMenuNode.GetAbsoluteName: string;
 begin
-  if Assigned(Parent) then Result := Parent.GetAbsoluteName + ' - ';
-  if Assigned(Parent) then Result := Result + GetName;
+  if Assigned(Parent) and Assigned(Parent.Parent) then Result := Parent.GetAbsoluteName + ' - ';
+  Result := Result + GetName;
 end;
 
@@ -347 +351 @@
         State := stNormal;
 
-      if Copy(Trim(Line), 1, 1) = '#' then begin
+      if (Copy(Trim(Line), 1, 1) = '#') or (Copy(Trim(Line), 1, 2) = '\#') then begin
         // Skip comments
         Continue;
@@ -439 +443 @@
         NewItem.Selects.Add(Parameter);
       end else
+      if Command = '---' then begin
+        Command := GetNextToken(Line);
+        if Command = 'help' then begin
+          Parameter := GetNextToken(Line);
+          State := stHelp;
+          HelpIndent := LineIndent;
+        end;
+      end else
       if (Command = 'help') or (Command = '---help---') then begin
         Parameter := GetNextToken(Line);
@@ -577 +589 @@
   finally
     Content.Free;
+  end;
+end;
+
+procedure TConfigMenu.OptionListNames(List: TStringList);
+var
+  I: Integer;
+  Node: TMenuNode;
+begin
+  for I := 0 to List.Count - 1 do begin
+    Node := TopNode.FindNode(List[I]);
+    if Assigned(Node) then
+      List[I] := List[I] + ' ' + Node.GetAbsoluteName;
   end;
 end;