[Compbench-devel] CompBenchmarks++/Benchmark Benchmark.h, 1.11, 1.12

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

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

Modified Files:
	Benchmark.h 
Log Message:
Some protected methods have gone public (for Perl API).

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Benchmark.h	28 Dec 2006 13:19:47 -0000	1.11
--- Benchmark.h	28 Dec 2006 18:17:36 -0000	1.12
***************
*** 13,16 ****
--- 13,18 ----
  #include <Compiler/Compiler-Options.h>
  
+ #include <vector>
+ 
  class CBMSystem;
  
***************
*** 57,94 ****
    virtual std::string expectedMD5(void) = 0;
  
-   /** Package name
-    *  \return a std::string like 'gzip', without quotes */
-   virtual std::string packageName(void);
- 
-   /** Package version
-    *  \return a std::string like '1.2.4', without quotes */
-   virtual std::string packageVersion(void) = 0;
- 
-   /** Package size, in bytes
-    *  \return an integer coding the size of package's archive (to download) in bytes.
-    */
-   virtual int packageSize(void) = 0;
- 
-   /** Package comments
-    *  Gives comments about package. Short description, or what ever.
-    *  \return comments, as std::string
-    */
-   virtual std::string packageComments(void) = 0;
- 
-   /** Package local filename
-    *  \return a relative filename containing the local name of the uncompressed
-    *  package (like 'gzip-1.2.4.tar.Z', without quotes) */
-   virtual std::string localPackageName(void) = 0;
- 		
- 
-   /** Benchmark name
-       \return a std::string representing current benchmark's identification
-       (e.g. gzip-1c) */
-   virtual std::string benchmarkName(void) = 0;
- 
-   /** Benchmark comments
-       \return a std::string containing comments about current benchmark */
-   virtual std::string benchmarkComments(void) = 0;
-   
    /** Benchmark's status
     *  Initialise the status from file in the directory defined by CBMSystem::Status.
--- 59,62 ----
***************
*** 114,147 ****
    CBMBenchmark(class CBMSystem *_system);
  
-   /** Benchmark's language
-    *  \return std::string (C or C++) */
-   virtual std::string language(void) = 0;
- 
-   /** Returns package or benchmark license
-       \return a std::string describing license */
-   virtual std::string license(void) = 0;
- 
-   /** Returns package home page
-       \return URL in std::string */
-   virtual std::string homePage(void) = 0;
- 
-   /** Author(s) of package
-       \return std::string containing authors. */
-   virtual std::string author(void) = 0;
- 
-   /** Convenience method
-    *  \return local uncompressed absolute archive filename for benchmark.
-    *  \sa localPackageName() */
-   virtual std::string localPackageAbsoluteName(void);
-   /** Convenience method
-    *  \return directory used for extracting package
-    *  \sa CBMSystem::Extract */
-   virtual std::string localPackageAbsoluteDirectory(void);
- 
-   /** Relative directory to extract package
-    *  \return relative directory to use (or used, depending) for package extraction
-    *  \sa CBMSystem::Extract */
-   virtual char* extractDirectory(void) = 0;
- 
    /** Pure method to extract package
        \return 1 if ok
--- 82,85 ----
***************
*** 163,175 ****
    virtual int patch(int _force = 0);
  
- 
-   /** Indicates if the package provides a test method.
-    *  Must be overloaded if so. Returns 0 by default.
-    *  \return 0 by default, 1 if patch is needed.
-    *  \sa test()
-    *  \sa Test()
-    */
-   virtual int hasTest(void);
- 
    /** Method to test package.
     *  Must be overloaded to test package using a method provided by package
--- 101,104 ----
***************
*** 245,248 ****
--- 174,249 ----
   public:
  
+   /** Package name
+    *  \return a std::string like 'gzip', without quotes */
+   virtual std::string packageName(void);
+ 
+   /** Package version
+    *  \return a std::string like '1.2.4', without quotes */
+   virtual std::string packageVersion(void) = 0;
+ 
+   /** Package size, in bytes
+    *  \return an integer coding the size of package's archive (to download) in bytes.
+    */
+   virtual int packageSize(void) = 0;
+ 
+   /** Package comments
+    *  Gives comments about package. Short description, or what ever.
+    *  \return comments, as std::string
+    */
+   virtual std::string packageComments(void) = 0;
+ 
+   /** Package local filename
+    *  \return a relative filename containing the local name of the uncompressed
+    *  package (like 'gzip-1.2.4.tar.Z', without quotes) */
+   virtual std::string localPackageName(void) = 0;
+ 		
+ 
+   /** Benchmark name
+       \return a std::string representing current benchmark's identification
+       (e.g. gzip-1c) */
+   virtual std::string benchmarkName(void) = 0;
+ 
+   /** Benchmark comments
+       \return a std::string containing comments about current benchmark */
+   virtual std::string benchmarkComments(void) = 0;
+   
+   /** Benchmark's language
+    *  \return std::string (C or C++) */
+   virtual std::string language(void) = 0;
+ 
+   /** Returns package or benchmark license
+       \return a std::string describing license */
+   virtual std::string license(void) = 0;
+ 
+   /** Returns package home page
+       \return URL in std::string */
+   virtual std::string homePage(void) = 0;
+ 
+   /** Author(s) of package
+       \return std::string containing authors. */
+   virtual std::string author(void) = 0;
+ 
+   /** Convenience method
+    *  \return local uncompressed absolute archive filename for benchmark.
+    *  \sa localPackageName() */
+   virtual std::string localPackageAbsoluteName(void);
+   /** Convenience method
+    *  \return directory used for extracting package
+    *  \sa CBMSystem::Extract */
+   virtual std::string localPackageAbsoluteDirectory(void);
+ 
+   /** Relative directory to extract package
+    *  \return relative directory to use (or used, depending) for package extraction
+    *  \sa CBMSystem::Extract */
+   virtual char* extractDirectory(void) = 0;
+ 
+   /** Indicates if the package provides a test method.
+    *  Must be overloaded if so. Returns 0 by default.
+    *  \return 0 by default, 1 if patch is needed.
+    *  \sa test()
+    *  \sa Test()
+    */
+   virtual int hasTest(void);
+ 
    /** URL used for downloading package.
     *  \return std::string representing the URL of the package
***************
*** 405,409 ****
    extern "C" int cbmlib_getBenchmarkNumber(void); \
    extern "C" CBMBenchmark *cbmlib_getBenchmark(int idx, class CBMSystem *_system); \
!   extern "C"  CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, class CBMSystem *_system)
  
  #endif
--- 406,411 ----
    extern "C" int cbmlib_getBenchmarkNumber(void); \
    extern "C" CBMBenchmark *cbmlib_getBenchmark(int idx, class CBMSystem *_system); \
!   extern "C"  CBMBenchmark *cbmlib_getBenchmarkByName(char *bench_id, class CBMSystem *_system); \
!   extern "C" std::vector<std::string> cbmlib_getBenchmarks(void)
  
  #endif