[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.4, 1.5 Benchmark-BENCHPP.h, 1.4, 1.5 Benchmark-BENCHPPLINUX.cpp, 1.7, 1.8

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

Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30793

Modified Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h 
	Benchmark-BENCHPPLINUX.cpp 
Log Message:
API changes on CBM::Package

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-BENCHPP.cpp	21 Jan 2007 20:46:46 -0000	1.4
--- Benchmark-BENCHPP.cpp	21 Jan 2007 21:16:49 -0000	1.5
***************
*** 23,42 ****
  }
  
! std::string PackageBENCHPP::packageName(void)
  {
    return("benchpp");
  }
  
! std::string PackageBENCHPP::packageVersion(void)
  {
    return("1.1");
  }
  
! int PackageBENCHPP::packageSize(void)
  {
    return(177532);
  }
  
! std::string PackageBENCHPP::packageComments(void)
  {
    return("The suite is based on the Ada PIWG suite, and therefore is " \
--- 23,42 ----
  }
  
! std::string PackageBENCHPP::Name(void)
  {
    return("benchpp");
  }
  
! std::string PackageBENCHPP::Version(void)
  {
    return("1.1");
  }
  
! int PackageBENCHPP::Size(void)
  {
    return(177532);
  }
  
! std::string PackageBENCHPP::Comments(void)
  {
    return("The suite is based on the Ada PIWG suite, and therefore is " \
***************
*** 56,60 ****
  }
  
! std::string PackageBENCHPP::localPackageName(void)
  {
    return("bench_plus_plus_1.1.tar.Z");
--- 56,60 ----
  }
  
! std::string PackageBENCHPP::localName(void)
  {
    return("bench_plus_plus_1.1.tar.Z");
***************
*** 87,91 ****
  
    cmd+="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && if test ! -f ";
    cmd+=patch;
--- 87,91 ----
  
    cmd+="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && if test ! -f ";
    cmd+=patch;
***************
*** 104,108 ****
  int PackageBENCHPP::extract(int _force)
  {
!   std::string localFile = localPackageAbsoluteName();
    std::string cmd;
    std::string sstdout;
--- 104,108 ----
  int PackageBENCHPP::extract(int _force)
  {
!   std::string localFile = localAbsoluteName();
    std::string cmd;
    std::string sstdout;
***************
*** 133,137 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    
--- 133,137 ----
  
    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    
***************
*** 156,160 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 156,160 ----
  
    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 194,198 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 194,198 ----
  
    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 217,223 ****
  }
  
! int PackageBENCHPP::benchmarkSize(void)
  {
!   return(packageSize());
  }
  
--- 217,223 ----
  }
  
! int PackageBENCHPP::totalSize(void)
  {
!   return(Size());
  }
  
***************
*** 247,251 ****
  
    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
--- 247,251 ----
  
    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
***************
*** 328,332 ****
  
    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
--- 328,332 ----
  
    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();

Index: Benchmark-BENCHPPLINUX.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Benchmark-BENCHPPLINUX.cpp	21 Jan 2007 20:46:46 -0000	1.7
--- Benchmark-BENCHPPLINUX.cpp	21 Jan 2007 21:16:49 -0000	1.8
***************
*** 35,54 ****
  }
  
! std::string PackageBENCHPPLINUX::packageName(void)
  {
    return("benchpplinux");
  }
  
! std::string PackageBENCHPPLINUX::packageVersion(void)
  {
    return("1.1v5");
  }
  
! int PackageBENCHPPLINUX::packageSize(void)
  {
    return(83702);
  }
  
! std::string PackageBENCHPPLINUX::packageComments(void)
  {
    return("Bench++ for Linux is a port of Bench++ (based on " \
--- 35,54 ----
  }
  
! std::string PackageBENCHPPLINUX::Name(void)
  {
    return("benchpplinux");
  }
  
! std::string PackageBENCHPPLINUX::Version(void)
  {
    return("1.1v5");
  }
  
! int PackageBENCHPPLINUX::Size(void)
  {
    return(83702);
  }
  
! std::string PackageBENCHPPLINUX::Comments(void)
  {
    return("Bench++ for Linux is a port of Bench++ (based on " \
***************
*** 57,61 ****
  }
  
! std::string PackageBENCHPPLINUX::localPackageName(void)
  {
    return("bench_plus_plus_1.1_linux5.tgz");
--- 57,61 ----
  }
  
! std::string PackageBENCHPPLINUX::localName(void)
  {
    return("bench_plus_plus_1.1_linux5.tgz");
***************
*** 74,78 ****
  int PackageBENCHPPLINUX::extract(int _force)
  {
!   std::string localFile = localPackageAbsoluteName();
    std::string cmd;
    std::string sstdout;
--- 74,78 ----
  int PackageBENCHPPLINUX::extract(int _force)
  {
!   std::string localFile = localAbsoluteName();
    std::string cmd;
    std::string sstdout;
***************
*** 105,109 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    
--- 105,109 ----
  
    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    
***************
*** 126,130 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 126,130 ----
  
    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 148,152 ****
  
    cmd="cd ";
!   cmd+=localPackageAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
--- 148,152 ----
  
    cmd="cd ";
!   cmd+=localAbsoluteDirectory();
    cmd+=" && ";
    cmd+=CBM_PROG_MAKE;
***************
*** 171,177 ****
  }
  
! int PackageBENCHPPLINUX::benchmarkSize(void)
  {
!   return(packageSize());
  }
  
--- 171,177 ----
  }
  
! int PackageBENCHPPLINUX::totalSize(void)
  {
!   return(Size());
  }
  
***************
*** 191,195 ****
  
    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
--- 191,195 ----
  
    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
***************
*** 291,295 ****
  
    cmd="cd ";
!   cmd+=package->localPackageAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();
--- 291,295 ----
  
    cmd="cd ";
!   cmd+=package->localAbsoluteDirectory();
    cmd+=" && echo $(./";
    cmd+=benchppBenchmark();

Index: Benchmark-BENCHPP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-BENCHPP.h	21 Jan 2007 20:46:46 -0000	1.4
--- Benchmark-BENCHPP.h	21 Jan 2007 21:16:49 -0000	1.5
***************
*** 23,32 ****
      virtual std::string expectedMD5(void);
  
!     virtual std::string packageName(void);
  
!     virtual std::string packageVersion(void);
!     virtual int packageSize(void); /* in bytes */
!     virtual std::string packageComments(void);
!     virtual std::string localPackageName(void);
  		
  
--- 23,32 ----
      virtual std::string expectedMD5(void);
  
!     virtual std::string Name(void);
  
!     virtual std::string Version(void);
!     virtual int Size(void); /* in bytes */
!     virtual std::string Comments(void);
!     virtual std::string localName(void);
  		
  
***************
*** 54,58 ****
      virtual std::string author(void);
  
!     virtual int benchmarkSize(void);
      virtual ~PackageBENCHPP();
  		
--- 54,58 ----
      virtual std::string author(void);
  
!     virtual int totalSize(void);
      virtual ~PackageBENCHPP();