Changeset 4

Timestamp:

May 1, 2014, 7:29:12 PM (11 years ago)

Author:

chronos

Message:

• Added: Rearrange items in tree according Depends and Condition.
• Fixed: Wrong parsing multiline commands.
• Added: Log and option list forms.

Location:

trunk

Files:

• LinuxBuilder.lpi (modified) (2 diffs)
• LinuxBuilder.lpr (modified) (2 diffs)
• UFormList.lfm (added)
• UFormList.pas (added)
• UFormLog.lfm (added)
• UFormLog.pas (added)
• UFormMain.lfm (modified) (4 diffs)
• UFormMain.pas (modified) (7 diffs)
• UKConfig.pas (modified) (13 diffs)

trunk/LinuxBuilder.lpi

@@ -33 +33 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="3">
+    <Units Count="5">
       <Unit0>
         <Filename Value="LinuxBuilder.lpr"/>
@@ -52 +52 @@
         <UnitName Value="UKConfig"/>
       </Unit2>
+      <Unit3>
+        <Filename Value="UFormList.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormList"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormList"/>
+      </Unit3>
+      <Unit4>
+        <Filename Value="UFormLog.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormLog"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormLog"/>
+      </Unit4>
     </Units>
   </ProjectOptions>

trunk/LinuxBuilder.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UKConfig
+  Forms, UFormMain, UKConfig, UFormList, UFormLog
   { you can add units after this };
 
@@ -17 +17 @@
   Application.Initialize;
   Application.CreateForm(TFormMain, FormMain);
+  Application.CreateForm(TFormList, FormList);
+  Application.CreateForm(TFormLog, FormLog);
   Application.Run;
 end.

trunk/UFormMain.lfm

@@ -18 +18 @@
     Height = 504
     Top = 0
-    Width = 840
+    Width = 520
     Anchors = [akTop, akLeft, akRight, akBottom]
     DefaultItemHeight = 24
+    ReadOnly = True
+    RowSelect = True
     TabOrder = 0
+    OnSelectionChanged = TreeView1SelectionChanged
+    Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
   end
   object StatusBar1: TStatusBar
@@ -45 +49 @@
       Style = tbsCheck
     end
+    object ToolButton1: TToolButton
+      Left = 24
+      Top = 2
+      Action = AShowList
+    end
+  end
+  object Memo1: TMemo
+    Left = 536
+    Height = 498
+    Top = 0
+    Width = 312
+    Anchors = [akTop, akRight, akBottom]
+    ReadOnly = True
+    ScrollBars = ssAutoBoth
+    TabOrder = 3
   end
   object MainMenu1: TMainMenu
@@ -61 +80 @@
         Action = AViemSystem
       end
+      object MenuItem5: TMenuItem
+        Action = AShowList
+      end
+      object MenuItem6: TMenuItem
+        Action = AShowLog
+      end
     end
   end
@@ -75 +100 @@
       OnExecute = AViemSystemExecute
     end
+    object AShowList: TAction
+      Caption = 'Show list'
+      OnExecute = AShowListExecute
+    end
+    object AShowLog: TAction
+      Caption = 'Show log'
+      OnExecute = AShowLogExecute
+    end
   end
   object ImageList1: TImageList

trunk/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ActnList, ComCtrls, UKConfig;
+  ActnList, ComCtrls, StdCtrls, UKConfig;
 
 type
@@ -14 +14 @@
 
   TFormMain = class(TForm)
+    AShowList: TAction;
+    AShowLog: TAction;
     AViemSystem: TAction;
     AOpenDir: TAction;
@@ -19 +21 @@
     ImageList1: TImageList;
     MainMenu1: TMainMenu;
+    Memo1: TMemo;
     MenuItem1: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
+    MenuItem5: TMenuItem;
+    MenuItem6: TMenuItem;
     StatusBar1: TStatusBar;
     ToolBar1: TToolBar;
+    ToolButton1: TToolButton;
     ToolButton2: TToolButton;
     TreeView1: TTreeView;
     procedure AOpenDirExecute(Sender: TObject);
+    procedure AShowListExecute(Sender: TObject);
+    procedure AShowLogExecute(Sender: TObject);
     procedure AViemSystemExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure TreeView1SelectionChanged(Sender: TObject);
   private
-    { private declarations }
+    procedure DoLog(Text: string);
   public
     Config: TConfigMenu;
@@ -44 +53 @@
 implementation
 
+uses
+  UFormList, UFormLog;
+
 {$R *.lfm}
 
@@ -52 +64 @@
   Config.LoadFromDir('/home/chronos/Stažené/linux-3.14.1', 'x86');
   Reload;
+end;
+
+procedure TFormMain.TreeView1SelectionChanged(Sender: TObject);
+begin
+  if Assigned(TreeView1.Selected) then begin
+    if Assigned(TreeView1.Selected.Data) then
+      TMenuNode(TreeView1.Selected.Data).LoadStats(Memo1.Lines)
+      else Memo1.Lines.Clear;
+  end;
+end;
+
+procedure TFormMain.DoLog(Text: string);
+begin
+  FormLog.Memo1.Lines.Add(Text);
 end;
 
@@ -76 +102 @@
 end;
 
+procedure TFormMain.AShowListExecute(Sender: TObject);
+begin
+  FormList.Show;
+end;
+
+procedure TFormMain.AShowLogExecute(Sender: TObject);
+begin
+  FormLog.Show;
+end;
+
 procedure TFormMain.AViemSystemExecute(Sender: TObject);
 begin
@@ -85 +121 @@
 begin
   Config := TConfigMenu.Create;
+  Config.OnLog := DoLog;
 end;
 

trunk/UKConfig.pas

@@ -14 +14 @@
   TLoadTreeOption = (toShowSystem);
   TLoadTreeOptions = set of TLoadTreeOption;
+  TObjectMove = record
+    Source: TObject;
+    NewParent: TObject;
+  end;
+  TObjectMoves = array of TObjectMove;
 
   { TMenuNode }
@@ -33 +38 @@
     destructor Destroy; override;
     function GetName: string; virtual;
+    function GetabsoluteName: string; virtual;
     procedure LoadTreeNode(Node: TTreeNode; Options: TLoadTreeOptions = []); virtual;
-  end;
+    procedure LoadStats(List: TStrings); virtual;
+    procedure SaveToList(List: TStrings); virtual;
+    procedure PrepareMoveList(var List: TObjectMoves); virtual;
+    function GetTopNode: TMenuNode; virtual;
+    function FindNode(ID: string): TMenuNode; virtual;
+  end;
+
+  TOnLogEvent = procedure (Text: string) of object;
 
   { TConfigMenu }
@@ -42 +55 @@
     CurrentMenu: TMenuNode;
     Arch: string;
+    FOnLog: TOnLogEvent;
+    procedure Log(Text: string);
     function IsWhiteSpace(Character: Char): Boolean;
     function GetNextToken(var Text: string): string;
@@ -49 +64 @@
     BaseDir: string;
     procedure LoadFromDir(Dir: string; Arch: string);
+    property OnLog: TOnLogEvent read FOnLog write FOnLog;
   end;
 
@@ -81 +97 @@
 end;
 
+function TMenuNode.GetabsoluteName: string;
+begin
+  if Assigned(Parent) then Result := Parent.GetabsoluteName + ' - ';
+  Result := Result + GetName;
+end;
+
 procedure TMenuNode.LoadTreeNode(Node: TTreeNode; Options: TLoadTreeOptions);
 var
@@ -90 +112 @@
     if (Name <> '') or ((Name = '') and (toShowSystem in Options)) then begin
       NewNode := Node.TreeNodes.AddChild(Node, GetName);
+      NewNode.Data := TMenuNode(Self.Items[I]);
       LoadTreeNode(NewNode, Options);
     end;
@@ -95 +118 @@
 end;
 
+procedure TMenuNode.LoadStats(List: TStrings);
+begin
+  with List do begin
+    Clear;
+    Add('ID: ' + ID);
+    Add('Name: ' + Name);
+    Add('Depends on: ' + Depends.Text);
+    Add('Selects: ' + Selects.Text);
+    Add('Description: ' + Description.Text);
+    Add('Condition: ' + Condition);
+    Add('Value type: ' + IntToStr(Integer(ValueType)));
+    Add('Default value: ' + DefaultValue);
+  end;
+end;
+
+procedure TMenuNode.SaveToList(List: TStrings);
+var
+  I: Integer;
+begin
+  if ID <> '' then List.Add(ID);
+  for I := 0 to Items.Count - 1 do
+  with TMenuNode(Items[I]) do begin
+    SaveToList(List);
+  end;
+end;
+
+procedure TMenuNode.PrepareMoveList(var List: TObjectMoves);
+var
+  I: Integer;
+  Node: TMenuNode;
+  NewMove: TObjectMove;
+begin
+  if Depends.Count > 0 then begin
+    Node := GetTopNode.FindNode(Depends[0]);
+    if Assigned(Node) and (Parent <> Node) then begin
+      NewMove.Source := Self;
+      NewMove.NewParent := Node;
+      SetLength(List, Length(List) + 1);
+      List[Length(List) - 1] := NewMove;
+    end;
+  end else
+  if Condition <> '' then begin
+    Node := GetTopNode.FindNode(Condition);
+    if Assigned(Node) and (Parent <> Node) then begin
+      NewMove.Source := Self;
+      NewMove.NewParent := Node;
+      SetLength(List, Length(List) + 1);
+      List[Length(List) - 1] := NewMove;
+    end;
+  end;
+  I := 0;
+  while I < Items.Count do
+  with TMenuNode(Items[I]) do begin
+    PrepareMoveList(List);
+    Inc(I);
+  end;
+end;
+
+function TMenuNode.GetTopNode: TMenuNode;
+begin
+  if Assigned(Parent) then Result := Parent.GetTopNode
+    else Result := Self;
+end;
+
+function TMenuNode.FindNode(ID: string): TMenuNode;
+var
+  I: Integer;
+begin
+  Result := nil;
+  if Self.ID = ID then Result := Self
+  else begin
+    I := 0;
+    while (I < Items.Count) do begin
+      Result := TMenuNode(Items[I]).FindNode(ID);
+      if Assigned(Result) then Break;
+      Inc(I);
+    end;
+  end;
+end;
+
 { TConfigMenu }
+
+procedure TConfigMenu.Log(Text: string);
+begin
+  if Assigned(FOnLog) then FOnLog(Text);
+end;
 
 function TConfigMenu.IsWhiteSpace(Character: Char): Boolean;
@@ -155 +263 @@
 
 begin
+  Log('FILE ' + FileName);
   try
     Content := TStringList.Create;
@@ -165 +274 @@
     for I := 0 to Content.Count - 1 do begin
       Line := MergedLines + Content[I];
+      MergedLines := '';
       LineIndent := 1;
       while (LineIndent <= Length(Line)) and IsWhiteSpace(Line[LineIndent]) do Inc(LineIndent);
@@ -317 +427 @@
         if Command = 'menu' then begin
           Parameter := GetNextToken(Line);
+          Log('MENU ' + Parameter + ' IN ' + CurrentMenu.GetAbsoluteName);
           NewMenu := TMenuNode.Create;
           NewMenu.Name := Parameter;
           NewMenu.Parent := CurrentMenu;
+          NewMenu.Condition := Condition;
+          Condition := '';
           NewItem := NewMenu;
           CurrentMenu.Items.Add(NewMenu);
@@ -325 +438 @@
         end else
         if command = 'endmenu' then begin
-          if Assigned(CurrentMenu.Parent) then
-            CurrentMenu := CurrentMenu.Parent
-            else raise Exception.Create('Can''t change menu level up. ' + GetLog);
+          Log('ENDMENU ' + CurrentMenu.GetAbsoluteName);
+          if Assigned(CurrentMenu.Parent) then begin
+            Condition := CurrentMenu.Condition;
+            CurrentMenu := CurrentMenu.Parent;
+          end else raise Exception.Create('Can''t change menu level up. ' + GetLog);
         end else
         if Command = 'if' then begin
@@ -346 +461 @@
 
 procedure TConfigMenu.LoadFromDir(Dir: string; Arch: string);
+var
+  Moves: TObjectMoves;
+  I: Integer;
 begin
   Self.Arch := Arch;
@@ -354 +472 @@
   CurrentMenu := TopNode;
   ParseFile(BaseDir + DirectorySeparator + 'Kconfig');
+
+  TopNode.PrepareMoveList(Moves);
+  for I := 0 to Length(Moves) - 1 do
+  with Moves[I] do begin
+    TMenuNode(Source).Parent.Items.OwnsObjects := False;
+    TMenuNode(Source).Parent.Items.Remove(Source);
+    TMenuNode(Source).Parent.Items.OwnsObjects := True;
+    TMenuNode(Source).Parent := TMenuNode(NewParent);
+    TMenuNode(NewParent).Items.Add(Source);
+  end;
 end;