[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-Autotools.cpp, 1.4, 1.5 Benchmark-Autotools.h, 1.4, 1.5

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

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

Modified Files:
	Benchmark-Autotools.cpp Benchmark-Autotools.h 
Log Message:
CBMPackage and new related API used.

Index: Benchmark-Autotools.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Autotools.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-Autotools.cpp	1 Nov 2006 12:59:04 -0000	1.4
--- Benchmark-Autotools.cpp	3 Jan 2007 21:58:02 -0000	1.5
***************
*** 6,15 ****
  #include <fstream>
  
! CBMBenchmarkAutotools::CBMBenchmarkAutotools(CBMSystem *_system)
!   : CBMBenchmark(_system)
  {
  }
  
! int CBMBenchmarkAutotools::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
--- 6,15 ----
  #include <fstream>
  
! CBMPackageAutotools::CBMPackageAutotools(CBMSystem *_system)
!   : CBMPackage(_system)
  {
  }
  
! int CBMPackageAutotools::extract(int _force)
  {
    std::string localFile = localPackageAbsoluteName();
***************
*** 30,34 ****
  }
  
! int CBMBenchmarkAutotools::configure(CBMCompiler        *_currentCompiler,
  				     CBMCompilerOptions *_currentOptions)
  
--- 30,34 ----
  }
  
! int CBMPackageAutotools::configure(CBMCompiler        *_currentCompiler,
  				     CBMCompilerOptions *_currentOptions)
  
***************
*** 72,76 ****
  }
  
! int CBMBenchmarkAutotools::make(void)
  {
    std::string cmd;
--- 72,76 ----
  }
  
! int CBMPackageAutotools::make(void)
  {
    std::string cmd;
***************
*** 86,90 ****
  }
  
! int CBMBenchmarkAutotools::release(void)
  {
    std::string cmd;
--- 86,90 ----
  }
  
! int CBMPackageAutotools::release(void)
  {
    std::string cmd;
***************
*** 100,104 ****
  }
  
! CBMBenchmarkAutotools::~CBMBenchmarkAutotools()
  {
  }
--- 100,104 ----
  }
  
! CBMPackageAutotools::~CBMPackageAutotools()
  {
  }

Index: Benchmark-Autotools.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Autotools.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Benchmark-Autotools.h	1 Nov 2006 12:59:04 -0000	1.4
--- Benchmark-Autotools.h	3 Jan 2007 21:58:02 -0000	1.5
***************
*** 10,23 ****
  #define H_CBMBENCHMARKAUTOTOOLS
  
  #include <Benchmark/Benchmark.h>
  
! 
! /** \brief Defines an abstract benchmark based on autotools.
   *
!  *  This class can be overloaded in order to get new external benchmarks and packages
!  *  supported by CompBenchmarks. Basically it sets up packages (like gzip) using
!  *  GNU autotools (./configure, make).
   */
! class CBMBenchmarkAutotools : public CBMBenchmark
  {
   private:
--- 10,23 ----
  #define H_CBMBENCHMARKAUTOTOOLS
  
+ #include <Benchmark/Package.h>
  #include <Benchmark/Benchmark.h>
  
! /** \brief Defines an abstract package based on autotools.
   *
!  *  This class can be overloaded in order to get new external packages
!  *  supported by CompBenchmarks. Basically it sets up packages (like gzip)
!  *  using GNU autotools (./configure, make).
   */
! class CBMPackageAutotools : public CBMPackage
  {
   private:
***************
*** 51,60 ****
    virtual int release(void);
  
-  public:
    /** Constructor */
!   CBMBenchmarkAutotools(class CBMSystem *_system);
  
    /** Virtual destructor */
!   virtual ~CBMBenchmarkAutotools();
  		
  };
--- 51,59 ----
    virtual int release(void);
  
    /** Constructor */
!   CBMPackageAutotools(class CBMSystem *_system);
  
    /** Virtual destructor */
!   virtual ~CBMPackageAutotools();
  		
  };