[Compbench-devel] CompBenchmarks++/libcompbenchmarks/UI UI-Console.cpp, 1.1, 1.2

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15621

Modified Files:
	UI-Console.cpp 
Log Message:
New messages handled.
Changes in way displaying infos & outputs.

Index: UI-Console.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Console.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UI-Console.cpp	6 Jun 2007 15:54:38 -0000	1.1
--- UI-Console.cpp	6 Jun 2007 17:39:59 -0000	1.2
***************
*** 165,168 ****
--- 165,180 ----
      curmsg+=objectField(_msg, "name");
      break;
+   case UIMsg::PackageConfigure:
+     curmsg+="Configuring ";
+     curmsg+=objectField(_msg, "name");
+     break;
+   case UIMsg::PackageMake:
+     curmsg+="Building ";
+     curmsg+=objectField(_msg, "name");
+     break;
+   case UIMsg::PackageClean:
+     curmsg+="Cleaning ";
+     curmsg+=objectField(_msg, "name");
+     break;
    case UIMsg::PackagePreconfigure:
      curmsg+="Pre-configure ";
***************
*** 185,188 ****
--- 197,203 ----
      curmsg+=objectField(_msg, "name");
      break;
+  case UIMsg::Group:
+     curmsg+=objectField(_msg, "name");
+     break;
    default:
      curmsg+="Display::DEFAULT/";
***************
*** 219,222 ****
--- 234,239 ----
    int       d = depth(_msg);
    int       s;
+   int       p_sp = 0;
+   int       frc = 0;
  
    //  std::cout << _msg->str() << std::endl;
***************
*** 237,244 ****
      status=(UIMsg::Status)atoi(A->Value().c_str());
  
!     if (childNumber(_msg)) {
        s=d+1;
        while (s--)
  	std::cout << " ";
      }
  
--- 254,262 ----
      status=(UIMsg::Status)atoi(A->Value().c_str());
  
!     if ((frc) || (childNumber(_msg))) {
        s=d+1;
        while (s--)
  	std::cout << " ";
+       p_sp=1;
      }
  
***************
*** 255,269 ****
--- 273,300 ----
        std::cout << "OK";
        lastisLF=0;
+       p_sp=0;
        break;
      case UIMsg::KO:
        std::cout << "Failed.";
        lastisLF=0;
+       p_sp=0;
        break;
      case UIMsg::Info:
+       if (!lastisLF) {
+ 	LF();
+ 	if (d) {
+ 	  s=d+1;
+ 	  while (s--)
+ 	    std::cout << " ";
+ 	  p_sp=1;
+ 	}
+       }
        std::cout << N->Value();
+       p_sp=0;
        lastisLF=0;
        break;
      }
      LF();
+     frc=1;
    }
    // lastisLF=0;