[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.7, 1.8 Package.cpp, 1.12, 1.13

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

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

Modified Files:
	Benchmark.cpp Package.cpp 
Log Message:
Improved UI API.

Index: Package.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Package.cpp	16 May 2007 09:45:41 -0000	1.12
--- Package.cpp	16 May 2007 12:06:17 -0000	1.13
***************
*** 203,209 ****
    info+=Version();
  
-   cbmUI->Information(CBM::UI::BenchDownload,
- 		     info);
-   
    try {
      system->download(downloadURL(),
--- 203,206 ----
***************
*** 215,231 ****
  
    if (cbmSystem->fileExists(localFile)) {
      expected_md5=expectedMD5();
      md5=system->md5File(localFile);
  
      if (expected_md5==md5) {
!       cbmUI->Information(CBM::UI::ChecksumOK,
! 		      localFile);
  
        storeStatus(Downloaded);
        return(1);
      } else {
!       cbmUI->Information(CBM::UI::ChecksumFailed,
! 		      localFile);
! 
        system->unlink((char*) localFile.c_str());
        info="Unsuccesfull download ";
--- 212,231 ----
  
    if (cbmSystem->fileExists(localFile)) {
+ 
+     cbmUI->Information(CBM::UI::Checksum,
+ 		       localFile);
+ 
      expected_md5=expectedMD5();
      md5=system->md5File(localFile);
  
      if (expected_md5==md5) {
!       cbmUI->Information(CBM::UI::Checksum,
! 			 CBM::UI::OK);
  
        storeStatus(Downloaded);
        return(1);
      } else {
!       cbmUI->Information(CBM::UI::Checksum,
! 			 CBM::UI::Failed);
        system->unlink((char*) localFile.c_str());
        info="Unsuccesfull download ";
***************
*** 237,240 ****
--- 237,243 ----
      }
    } else {
+     cbmUI->Information(CBM::UI::Checksum,
+ 		       CBM::UI::Failed);
+ 
      info="Can't download ";
      info+=downloadURL();
***************
*** 257,268 ****
    }
  
!   cbmUI->Information(CBM::UI::BenchExtract,
  		     Name());
  	   
    r=extract(_force);
  
!   if (r)
      storeStatus(Extracted);
!   else {
      std::string info;
      info="Error extracting ";
--- 260,276 ----
    }
  
!   cbmUI->Information(CBM::UI::PackageExtract,
  		     Name());
  	   
    r=extract(_force);
  
!   if (r) {
      storeStatus(Extracted);
!     cbmUI->Information(CBM::UI::PackageExtract,
! 		       CBM::UI::OK);
! 
!   } else {
!     cbmUI->Information(CBM::UI::PackageExtract,
! 		       CBM::UI::Failed);
      std::string info;
      info="Error extracting ";
***************
*** 288,299 ****
    }
  
!   cbmUI->Information(CBM::UI::BenchPatch,
  		     Name());
  	   
    r=patch(_force);
  
!   if (r)
      storeStatus(Patched);
!   else {
      std::string info;
      info="Error patching ";
--- 296,312 ----
    }
  
!   cbmUI->Information(CBM::UI::PackagePatch,
  		     Name());
  	   
    r=patch(_force);
  
!   if (r) {
      storeStatus(Patched);
!     cbmUI->Information(CBM::UI::PackagePatch,
! 		       CBM::UI::OK);
! 
!   } else {
!     cbmUI->Information(CBM::UI::PackagePatch,
! 		       CBM::UI::Failed);
      std::string info;
      info="Error patching ";
***************
*** 318,329 ****
  
  
!   cbmUI->Information(CBM::UI::BenchPreconfigure,
  		     Name());
  
    r=preConfigure(_force);
  
!   if (r)
      storeStatus(Preconfigured);
!   else {
      std::string info;
  
--- 331,346 ----
  
  
!   cbmUI->Information(CBM::UI::PackagePreconfigure,
  		     Name());
  
    r=preConfigure(_force);
  
!   if (r) {
      storeStatus(Preconfigured);
!     cbmUI->Information(CBM::UI::PackagePreconfigure,
! 		       CBM::UI::OK);
!   } else {
!     cbmUI->Information(CBM::UI::PackagePreconfigure,
! 		       CBM::UI::Failed);
      std::string info;
  
***************
*** 371,376 ****
    }
  
!   cbmUI->Information(CBM::UI::BenchConfigure,
! 		  info);
  
    r=configure(_currentCompiler,
--- 388,393 ----
    }
  
!   cbmUI->Information(CBM::UI::PackageConfigure,
! 		     info);
  
    r=configure(_currentCompiler,
***************
*** 378,385 ****
--- 395,407 ----
  
    if (r) {
+   cbmUI->Information(CBM::UI::PackageConfigure,
+ 		     CBM::UI::OK);
+ 
      storeStatus(Configured);
      currentCompiler=_currentCompiler;
      currentOptions=_currentOptions;
    } else {
+     cbmUI->Information(CBM::UI::PackageConfigure,
+ 		       CBM::UI::Failed);
      info="Configure failed for ";
      info+=Name();
***************
*** 402,407 ****
    }
  
!   cbmUI->Information(CBM::UI::BenchMake,
! 		  Name());
  
    system->startTimer();
--- 424,429 ----
    }
  
!   cbmUI->Information(CBM::UI::PackageMake,
! 		     Name());
  
    system->startTimer();
***************
*** 416,420 ****
--- 438,446 ----
  		 currentOptions);
      System()->storeConfiguration();
+     cbmUI->Information(CBM::UI::PackageMake,
+ 		       CBM::UI::OK);
    } else {
+     cbmUI->Information(CBM::UI::PackageMake,
+ 		       CBM::UI::Failed);
      info="Make failed for ";
      info+=Name();
***************
*** 453,458 ****
  
    if (UO_enableTestSuite) {
!     cbmUI->Information(CBM::UI::BenchTest,
! 		    Name());
    
      r=test(_force);
--- 479,485 ----
  
    if (UO_enableTestSuite) {
!     cbmUI->Information(CBM::UI::PackageTest,
! 		       Name());
! 		       
    
      r=test(_force);
***************
*** 460,471 ****
      dum=Name();
      dum+=" : passed (disabled by user option).";
!     cbmUI->Information(CBM::UI::BenchTest,
! 		    dum);
      r=1;
    }
  
!   if (r)
      storeStatus(Tested);
!   else {
      std::string info;
      info="Error testing ";
--- 487,502 ----
      dum=Name();
      dum+=" : passed (disabled by user option).";
!     cbmUI->Information(CBM::UI::PackageTest,
! 		       dum);
      r=1;
    }
  
!   if (r) {
      storeStatus(Tested);
!     cbmUI->Information(CBM::UI::PackageTest,
! 		       CBM::UI::OK);
!   } else {
!     cbmUI->Information(CBM::UI::PackageTest,
! 		       CBM::UI::Failed);
      std::string info;
      info="Error testing ";
***************
*** 486,491 ****
    }
  
!   cbmUI->Information(CBM::UI::BenchClean,
! 		  Name());
  
  
--- 517,522 ----
    }
  
!   cbmUI->Information(CBM::UI::PackageClean,
! 		     Name());
  
  
***************
*** 494,498 ****
--- 525,533 ----
      resetContext();
      storeStatus(Preconfigured);
+     cbmUI->Information(CBM::UI::PackageClean,
+ 		       CBM::UI::OK);
    } else {
+     cbmUI->Information(CBM::UI::PackageClean,
+ 		       CBM::UI::Failed);
      info="Clean failed for ";
      info+=Name();
***************
*** 548,562 ****
    if (cbmSystem->fileExists(dest)) {
      expected_md5=expectedMD5();
      md5=system->md5File(dest);
  
      if (expected_md5==md5) {
!       cbmUI->Information(CBM::UI::ChecksumOK,
! 		      dest);
  
        storeStatus(Downloaded);
        return(1);
      } else {
!       cbmUI->Information(CBM::UI::ChecksumFailed,
! 		      dest);
      }
    }
--- 583,601 ----
    if (cbmSystem->fileExists(dest)) {
      expected_md5=expectedMD5();
+ 
+     cbmUI->Information(CBM::UI::Checksum,
+ 		       dest);
+ 		       
      md5=system->md5File(dest);
  
      if (expected_md5==md5) {
!       cbmUI->Information(CBM::UI::Checksum,
! 			 CBM::UI::OK);
  
        storeStatus(Downloaded);
        return(1);
      } else {
!       cbmUI->Information(CBM::UI::Checksum,
! 			 CBM::UI::Failed);
      }
    }
***************
*** 569,573 ****
    int         r;
  
!   cbmUI->Information(CBM::UI::BenchUninstall,
  		     Name());
  
--- 608,612 ----
    int         r;
  
!   cbmUI->Information(CBM::UI::PackageUninstall,
  		     Name());
  
***************
*** 579,585 ****
      currentCompiler=0;
      currentOptions=0;
      return(r);
!   } else
      return(0);
  }
  
--- 618,634 ----
      currentCompiler=0;
      currentOptions=0;
+ 
+     if (r)
+       cbmUI->Information(CBM::UI::PackageUninstall,
+ 			 CBM::UI::OK);
+     else
+       cbmUI->Information(CBM::UI::PackageUninstall,
+ 			 CBM::UI::Failed);
      return(r);
!   } else {
!     cbmUI->Information(CBM::UI::PackageUninstall,
! 		       CBM::UI::Failed);
      return(0);
+   }
  }
  

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Benchmark.cpp	7 May 2007 20:06:15 -0000	1.7
--- Benchmark.cpp	16 May 2007 12:06:17 -0000	1.8
***************
*** 73,78 ****
      info=Name();
      info+=" not tested !";
!     cbmUI->Information(CBM::UI::BenchTest,
! 		       info);
  
      return("0");
--- 73,79 ----
      info=Name();
      info+=" not tested !";
!     cbmUI->Information(CBM::UI::PackageTest,
! 		       info,
! 		       CBM::UI::Failed);
  
      return("0");
***************
*** 93,98 ****
      Package()->storeStatus(Package::Benchmarked);
      cbmUI->Information(CBM::UI::BenchResult,
! 		       r);
    } else {
      info="Benchmarking failed for ";
      info+=Package()->Name();
--- 94,101 ----
      Package()->storeStatus(Package::Benchmarked);
      cbmUI->Information(CBM::UI::BenchResult,
! 		       CBM::UI::OK);
    } else {
+     cbmUI->Information(CBM::UI::BenchResult,
+ 		       CBM::UI::Failed);
      info="Benchmarking failed for ";
      info+=Package()->Name();