compbench-devel

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-Selector.h, 1.1, 1.2

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

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

Modified Files:
	Benchmark-Selector.h 
Log Message:
For SF's TID #141819 : improving Doxygen documentation.

Index: Benchmark-Selector.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-Selector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-Selector.h	28 Dec 2006 17:41:04 -0000	1.1
--- Benchmark-Selector.h	4 Sep 2007 19:46:10 -0000	1.2
***************
*** 22,29 ****
   private:
   protected:
    class CBMSystem *system;
  
   public:
!   /** Constructor */
    CBMBenchmarkSelector(class CBMSystem *_system);
    
--- 22,32 ----
   private:
   protected:
+   /** Internal pointer to a CBM::System instance. */
    class CBMSystem *system;
  
   public:
!   /** Constructor.
!    *
!    *  \param _system A pointer to a CBM::System handler. */
    CBMBenchmarkSelector(class CBMSystem *_system);
    

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler Compiler.h, 1.13, 1.14 Compiler-Option-Description.h, 1.8, 1.9

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

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

Modified Files:
	Compiler.h Compiler-Option-Description.h 
Log Message:
For SF's TID #141819 : improving Doxygen documentation.

Index: Compiler.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Compiler.h	17 May 2007 14:31:12 -0000	1.13
--- Compiler.h	4 Sep 2007 19:45:50 -0000	1.14
***************
*** 152,170 ****
      virtual CompilerOptionLogicVar* colVarGet(std::string _id);
  
!     /** _writerOption is the option (ID) that sets the value */
      virtual void colVarSet(std::string _id,
  			   std::string _value,
  			   std::string _writerOption);
  
      virtual std::string colVarWriter(std::string _id);
  
      virtual int colOptionHas(std::string _option);
  
      virtual std::string analyzeOptions(std::string _options);
      virtual std::string shortHelpOptions(std::string _options);
  
      virtual int supportedVersionNumber(void);
      virtual std::string supportedVersion(int _index);
  
      virtual ~Compiler();
    };
--- 152,218 ----
      virtual CompilerOptionLogicVar* colVarGet(std::string _id);
  
!     /** Change value of an internal variable
!      *
!      *  This is useful for option logics.
!      *  \sa CBM::CompilerOptionDescriptions
!      *  \sa CBM::CompilerOptionLogic
!      *  \param _id Variable's identifier
!      *  \param _value Variable's (new) value
!      *  \param  _writerOption is the option (ID) that sets the value */
      virtual void colVarSet(std::string _id,
  			   std::string _value,
  			   std::string _writerOption);
  
+     /** Get latest writer to a variable.
+      *
+      *  \param _id Variable's identifier
+      *  \return writer's identifier.
+      *  \sa colVarSet */
      virtual std::string colVarWriter(std::string _id);
  
+     /** Checks if a variable is defined.
+      *
+      *  \param _option Option or Variable's identifier
+      *  \return 1 if the variable or option has been defined, 0 otherwise. */
      virtual int colOptionHas(std::string _option);
  
+     /** Analyze a set of options
+      *
+      *  This uses knowledge-base through CBM::CompilerOptionLogic instances
+      *  and cacheOptionDescriptions to evaluate compatibility or functional
+      *  redondancies (and others couple of things) between given option
+      *  string.
+      *
+      *  \param _options Option string
+      *  \return An std::string with comments or errors found.
+      */
      virtual std::string analyzeOptions(std::string _options);
+ 
+     /** Give short option's documentation(s)
+      *
+      *  \param _options Option string
+      *  \return Short help about options (from knowledge base).
+      */
      virtual std::string shortHelpOptions(std::string _options);
  
+     /** Returns supported branches' number
+      * 
+      *  Apply to current compiler's familly (eg. gcc, g++, tcc).
+      *  \return Number of supported branches.
+      */
      virtual int supportedVersionNumber(void);
+ 
+     /** Returns a supported branch identifier
+      *
+      *  Identifier looks like 3.0.x or 4.1.x (for GCC). This information
+      *  comes from knowledge base.
+      *
+      *  \param _index Index of branch
+      *  \return A std::string containing a branch identifier.
+      *  \sa supportedVersionNumber
+      */
      virtual std::string supportedVersion(int _index);
  
+     /** Destructor */
      virtual ~Compiler();
    };
***************
*** 178,188 ****
    private:
    protected:
      class System *system;
  
    public:
!     /** Constructor */
      CompilerSelector(class System *_system);
    
!     /** Main method.
       *  Returns a Compiler object.
       *  \param compilerBinary Absolute or relative name of the compiler program
--- 226,240 ----
    private:
    protected:
+     /** A CBM::System instance */
      class System *system;
  
    public:
!     /** Constructor
!      *  \param _system A CBM::System instance */
!     
      CompilerSelector(class System *_system);
    
!     /** Returns a CBM::Compiler object according to a (compiler) binary program.
!      *
       *  Returns a Compiler object.
       *  \param compilerBinary Absolute or relative name of the compiler program

Index: Compiler-Option-Description.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Description.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Compiler-Option-Description.h	1 May 2007 19:43:18 -0000	1.8
--- Compiler-Option-Description.h	4 Sep 2007 19:45:50 -0000	1.9
***************
*** 69,94 ****
    public:
      /** Constructor
! 	\param _from XML node to initialise object
      */
      CompilerOptionDescription(XMLNode *_from,
  			      CBM_CODs  *_parent);
  
!     /** Get option's internal ID
! 	\return std::string with ID */
      virtual std::string Id(void);
  
!     /** Get option's short description
! 	\return std::string containing a short description */
      virtual std::string ShortDescription(void);
  
!     /** Get editor's compiler option description
! 	\return std::string containing the option's editor description */
      virtual std::string EditorDescription(void);
  
!     /** Retrieves compiler's option
! 	\return Option string to pass to compiler */
      virtual std::string Option(void);
  
!     /** \brief Detect two-passes' compilations
       *  \return Returns 1 if current option need two-passes */
      virtual int CompilationTwoPassNeeded(void);
--- 69,100 ----
    public:
      /** Constructor
!      *  \param _from XML node to initialise object
!      *  \param _parent Descriptions' set (context).
      */
      CompilerOptionDescription(XMLNode *_from,
  			      CBM_CODs  *_parent);
  
!     /** Get option's internal ID.
!      *
!      *  \return std::string with ID */
      virtual std::string Id(void);
  
!     /** Get option's short description.
!      *
!      *  \return std::string containing a short description */
      virtual std::string ShortDescription(void);
  
!     /** Get editor's compiler option description.
!      *
!      *  \return std::string containing the option's editor description */
      virtual std::string EditorDescription(void);
  
!     /** Retrieves compiler's option.
!      *
!      *  \return Option string to pass to compiler */
      virtual std::string Option(void);
  
!     /** \brief Detect two-passes' compilations.
!      *
       *  \return Returns 1 if current option need two-passes */
      virtual int CompilationTwoPassNeeded(void);
***************
*** 109,114 ****
--- 115,126 ----
      virtual std::string CompilationFirstPassOption(void);
  
+     /** Fake option's usage.
+      *
+      *  Within a given context, put current option in used ones.
+      *  \return Error, warning or comments as english plain text messages.
+      */
      virtual std::string Use(void);
  
+     /** Virtual destructor */
      virtual ~CompilerOptionDescription();
    };
***************
*** 125,131 ****
      /** Descriptions read */
      std::vector<CompilerOptionDescription*>      descriptions;
      CBM_COM                                      *compiler;
     
! 
      std::string descriptionFile;
  
--- 137,144 ----
      /** Descriptions read */
      std::vector<CompilerOptionDescription*>      descriptions;
+     /** Compiler */
      CBM_COM                                      *compiler;
     
!     /** Internal description file used. */
      std::string descriptionFile;
  
***************
*** 142,146 ****
  
    public:
!     /** Constructor
       *  \param _baseDir Directory containings description.xml for the compiler
       */
--- 155,161 ----
  
    public:
!     /** Constructor.
!      *
!      *  \param _compiler Related compiler
       *  \param _baseDir Directory containings description.xml for the compiler
       */
***************
*** 148,161 ****
  			       std::string _baseDir);
  
!     /** Retrive description file used
!      *  \param std::string for description file name */
      virtual std::string DescriptionFile(void);
  
!     /** Returns descriptions' number
       *  \return Integer (numbe of read descriptions
       *  \sa Description(int _index) */
      virtual int DescriptionNumber(void);
  
!     /** Returns a description by its index
       *  \param _index Index of the description
       *  \return Option's description
--- 163,179 ----
  			       std::string _baseDir);
  
!     /** Retrive description file used.
!      *
!      *  \return std::string for description file name */
      virtual std::string DescriptionFile(void);
  
!     /** Returns descriptions' number.
!      *
       *  \return Integer (numbe of read descriptions
       *  \sa Description(int _index) */
      virtual int DescriptionNumber(void);
  
!     /** Returns a description by its index.
!      *
       *  \param _index Index of the description
       *  \return Option's description
***************
*** 165,169 ****
      virtual CompilerOptionDescription *Description(int _index);
  
!     /** Returns a description by its id
       *  \param _id description's ID
       *  \return Option's description
--- 183,188 ----
      virtual CompilerOptionDescription *Description(int _index);
  
!     /** Returns a description by its id.
!      *
       *  \param _id description's ID
       *  \return Option's description
***************
*** 172,176 ****
      virtual CompilerOptionDescription *Description(std::string _id);
  
!     /** Returns a description by its litteral option
       *  \return Option's description
       *  \sa Description(std::string _id)
--- 191,196 ----
      virtual CompilerOptionDescription *Description(std::string _id);
  
!     /** Returns a description by its litteral option.
!      *
       *  \return Option's description
       *  \sa Description(std::string _id)
***************
*** 178,186 ****
      virtual CompilerOptionDescription *DescriptionLitteral(std::string _litt);
  
!     /** Retrieve associated compiler
       *  \return Compiler used to initialize descriptions */
      virtual CBM_COM *Compiler(void);
  
!     /** Destructor */
      virtual ~CompilerOptionDescriptions();
    };
--- 198,207 ----
      virtual CompilerOptionDescription *DescriptionLitteral(std::string _litt);
  
!     /** Retrieve associated compiler.
!      *
       *  \return Compiler used to initialize descriptions */
      virtual CBM_COM *Compiler(void);
  
!     /** Destructor. */
      virtual ~CompilerOptionDescriptions();
    };

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Package.h, 1.7, 1.8

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

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

Modified Files:
	Package.h 
Log Message:
For SF's TID #141819 : improving Doxygen documentation.

Index: Package.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Package.h	4 Sep 2007 19:16:15 -0000	1.7
--- Package.h	4 Sep 2007 19:45:35 -0000	1.8
***************
*** 39,44 ****
     *  \sa BenchmarkVector */
    typedef struct {
!     std::string id;
!     CBM_BM      *instance;
    } BenchmarkCached;
  
--- 39,44 ----
     *  \sa BenchmarkVector */
    typedef struct {
!     std::string id;        /*!<  Benchmark's identifier */
!     CBM_BM      *instance; /*!<  Benchmark's instance */
    } BenchmarkCached;
  
***************
*** 115,123 ****
      /** Constructor
       *
!      *  Initialise the Package::system variable. */
      Package(class System *_system);
  
      /** Pure method to extract package
       *
       *  \return 1 if ok
       *  \sa Extract()
--- 115,125 ----
      /** Constructor
       *
!      *  Initialise the Package::system variable.
!      *  \param _system A CBM::System instance. */
      Package(class System *_system);
  
      /** Pure method to extract package
       *
+      *  \param _force toggle to 1 to force extraction, regardless of detected package's state.
       *  \return 1 if ok
       *  \sa Extract()
***************
*** 155,159 ****
       *
       *  Broadly speaking, this is ./configure
!      *  \param _curentCompiler Compiler to use
       *  \param _currentOptions Options to pass to compiler (through configuration mechanism)
       *  \sa Configure()
--- 157,161 ----
       *
       *  Broadly speaking, this is ./configure
!      *  \param _currentCompiler Compiler to use
       *  \param _currentOptions Options to pass to compiler (through configuration mechanism)
       *  \sa Configure()
***************
*** 165,170 ****
       *
       *  This could be a simple make, for instance.
- 
-      *  \param _force set this to 1 to force the build (regardless of package's state).
       *  \return 1 if ok
       *  \sa Make() */
--- 167,170 ----

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark-DLLoader.h, 1.1, 1.2 Benchmark.h, 1.8, 1.9 Benchmark-xZIP.h, 1.2, 1.3

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

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

Modified Files:
	Benchmark-DLLoader.h Benchmark.h Benchmark-xZIP.h 
Log Message:
For SF's TID #141819 : improving Doxygen documentation.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark.h	2 Aug 2007 17:06:28 -0000	1.8
--- Benchmark.h	4 Sep 2007 19:43:54 -0000	1.9
***************
*** 35,51 ****
    private:
    protected:
      class Package *package;
  
      /** Constructor
!      *  Initialise the Benchmark::system variable. */
      Benchmark(class Package *_package);
  
      /** Give object for underlaying system.
! 	Use package pointer.
! 	\sa package
      */
      virtual class System *System(void);
  
!     /** Pure virtual method to run benchmark
       *  \return Benchmark's result (as number).
       */
--- 35,57 ----
    private:
    protected:
+     /** Parent package for the benchmark. */
      class Package *package;
  
      /** Constructor
!      *
!      *  Initialise the Benchmark::system variable.
!      *  \param _package Related package.
!      */
      Benchmark(class Package *_package);
  
      /** Give object for underlaying system.
!      *
!      *  Use package instance's pointer.
!      *  \sa package
      */
      virtual class System *System(void);
  
!     /** Pure virtual method to run benchmark.
!      *
       *  \return Benchmark's result (as number).
       */
***************
*** 56,72 ****
  
    public:
!     /** Benchmark name
! 	\return a std::string representing current benchmark's identification
! 	(e.g. gzip-1c) */
      virtual std::string Name(void);
  
!     /** Benchmark comments
! 	\return a std::string containing comments about current benchmark */
      virtual std::string Comments(void) = 0;
    
      /** Run benchmark.
       *  Uses bench(). Overloading is unadvised.
       *  This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked.
!      *  \return benchmark's result (performance) as a non-null positive number in a CBM::Result instance. May changes status.
       *  \sa Make()
       *  \sa executionTime()
--- 62,82 ----
  
    public:
!     /** Benchmark name.
!      *
!      *  \return a std::string representing current benchmark's identification
!      *  (e.g. gzip-1c) */
      virtual std::string Name(void);
  
!     /** Benchmark comments.
!      * 	\return a std::string containing comments about current benchmark */
      virtual std::string Comments(void) = 0;
    
      /** Run benchmark.
+      *
       *  Uses bench(). Overloading is unadvised.
       *  This step won't be done and'll return 1 if getStatus()>=Package::Benchmarked.
!      *  \param C Compiler to use
!      *  \param O Options to use (compilation options)
!      *  \return benchmark's result indicators in a CBM::Result instance. May changes status.
       *  \sa Make()
       *  \sa executionTime()
***************
*** 76,79 ****
--- 86,90 ----
      
      /** Give execution time.
+      *
       *  Returns last execution time (in seconds) of bench().
       *  \return execution time in seconds

Index: Benchmark-DLLoader.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark-DLLoader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-DLLoader.h	22 Jan 2007 18:21:47 -0000	1.1
--- Benchmark-DLLoader.h	4 Sep 2007 19:43:54 -0000	1.2
***************
*** 30,51 ****
    /** Low-level internal benchmark's shared library object */
    typedef struct cbmlib_internal {
!     void                            *library;
!     cbmlib_internal_getPackage_t    PackageGet;
    };
  
    /** \brief Low-level library loading according to the benchmark/package's
!       internal name.
!       \param package_id something like gzip, bzip2, nbench and so on.
!   */
    cbmlib_internal *cbmlib_load(char *package_id);
    
    /** \brief Low-level function to Get a CBMBenchmark instance from a
     *   shared library.
     *  \param bench_id gzip-1c, benchpp-whetstone and so on.
!    *  \param _system A system instance.
     */
    Benchmark *cbmlib_bench_load(char *bench_id, System *_system);
    
!   /** \brief Low-level function for removing any internal existing reference to shared libraries. */
    void cbmlib_done(void);
  }
--- 30,57 ----
    /** Low-level internal benchmark's shared library object */
    typedef struct cbmlib_internal {
!     void                          *library;    /*!< Library pointer */
!     cbmlib_internal_getPackage_t  PackageGet;  /*!< Access method */
    };
  
    /** \brief Low-level library loading according to the benchmark/package's
!    *  internal name.
!    *
!    *  \param package_id something like gzip, bzip2, nbench and so on.
!    *  \return A pointer to a library.
!    */
    cbmlib_internal *cbmlib_load(char *package_id);
    
    /** \brief Low-level function to Get a CBMBenchmark instance from a
     *   shared library.
+    *
     *  \param bench_id gzip-1c, benchpp-whetstone and so on.
!    *  \param _system A CBM::System instance.
!    *  \return A benchmark's instance.
     */
    Benchmark *cbmlib_bench_load(char *bench_id, System *_system);
    
!   /** \brief Destroy dynamic library objects.
!    *
!    *   Low-level function for removing any internal existing reference to shared libraries. */
    void cbmlib_done(void);
  }

Index: Benchmark-xZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark-xZIP.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-xZIP.h	16 May 2007 12:07:09 -0000	1.2
--- Benchmark-xZIP.h	4 Sep 2007 19:43:54 -0000	1.3
***************
*** 48,52 ****
     
    public:
!     /** Constructor */
      PackagexZIP(class System *_system);
  
--- 48,53 ----
     
    public:
!     /** Constructor
!      *  \param _system A CBM::System instance. */
      PackagexZIP(class System *_system);
  
***************
*** 67,88 ****
    {
    protected:
      BenchmarkxZIP(CBM::Package *_package);
  
!     /** Compression level
! 	\return compression level ("0" .. "9") used.
!     */
      virtual char* compressionLevel(void) = 0;
  
      /** Program name
! 	\return std::string like gzip or bzip2.
!     */
      virtual std::string benchmarkProgram(void) = 0;
  
  
      /** Runs the benchmark
!      *  Gives the amount of compressed bytes per seconds (as CompBenchmarks always apply
!      *  "bigger is better" policy to benchmarks' results, we can just rely on time). */
  
      virtual std::string bench(void);
      virtual ~BenchmarkxZIP();
    };
--- 68,100 ----
    {
    protected:
+     /** Constructor.
+      *  \param _package Related package.
+      */
      BenchmarkxZIP(CBM::Package *_package);
  
!     /** Compression level.
!      *
!      *  \return compression level ("0" .. "9") used.
!      */
      virtual char* compressionLevel(void) = 0;
  
      /** Program name
!      *  \return std::string like gzip or bzip2.
!      */
      virtual std::string benchmarkProgram(void) = 0;
  
  
      /** Runs the benchmark
!      *
!      *  Gives the amount of compressed bytes per seconds (as CompBenchmarks
!      *  always apply "higher is better" policy to benchmarks' results, we
!      *  can just rely on time).
!      *
!      *  \return Benchmark performance (almost throughput).
!      */
  
      virtual std::string bench(void);
+ 
+     /** Destructor */
      virtual ~BenchmarkxZIP();
    };

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark-Autotools.h, 1.1, 1.2 Package.h, 1.6, 1.7

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

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

Modified Files:
	Benchmark-Autotools.h Package.h 
Log Message:
For SF's TID #141819 : improving Doxygen documentation.

Index: Package.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Package.h	15 Feb 2007 18:56:29 -0000	1.6
--- Package.h	4 Sep 2007 19:16:15 -0000	1.7
***************
*** 78,81 ****
--- 78,82 ----
    private:
      /** Package status
+      *
       *  \sa Package::Status
       *  \sa storeStatus()
***************
*** 88,95 ****
--- 89,98 ----
  
      /** Expected MD5 on downloaded package
+      *
       *  \return MD5 expected, as an std::string */
      virtual std::string expectedMD5(void) = 0;
  
      /** Package's status
+      *
       *  Initialise the status from file in the directory defined
       *  by CBM::System::Status.
***************
*** 111,137 ****
      class System    *system;
      /** Constructor
       *  Initialise the Package::system variable. */
      Package(class System *_system);
  
      /** Pure method to extract package
! 	\return 1 if ok
! 	\sa Extract()
! 	\sa localPackageAbsoluteDirectory() */
      virtual int extract(int _force = 0) = 0;
  
      /** Method to patch package
       *  Must be overloaded to patch package.
       *  \sa Patch() */
      virtual int patch(int _force = 0);
  
      /** Method to test package.
       *  Must be overloaded to test package using a method provided by package
       *  maintainers.
       *  \sa Test() */
      virtual int test(int _force = 0);
  
      /** Pure virtual method to pre-configure package
!      *  Pre-configuration creates any needed elements (files or what ever) to benchmark
!      *  package.
       *  \return 1 if ok.
       *  \sa PreConfigure()
--- 114,150 ----
      class System    *system;
      /** Constructor
+      *
       *  Initialise the Package::system variable. */
      Package(class System *_system);
  
      /** Pure method to extract package
!      *
!      *  \return 1 if ok
!      *  \sa Extract()
!      *  \sa localPackageAbsoluteDirectory() */
      virtual int extract(int _force = 0) = 0;
  
      /** Method to patch package
+      *
       *  Must be overloaded to patch package.
+      *
+      *  \param _force set this to 1 to force patching (regardless of package's state).
       *  \sa Patch() */
      virtual int patch(int _force = 0);
  
      /** Method to test package.
+      *
       *  Must be overloaded to test package using a method provided by package
       *  maintainers.
+      *
+      *  \param _force set this to 1 to force testing (regardless of package's state).
       *  \sa Test() */
      virtual int test(int _force = 0);
  
      /** Pure virtual method to pre-configure package
!      *
!      *  Pre-configuration creates any needed elements (files or what ever) to benchmark package or to configure/build it.
!      *
!      *  \param _force set this to 1 to force pre-configuration (regardless of package's state).
       *  \return 1 if ok.
       *  \sa PreConfigure()
***************
*** 139,144 ****
      virtual int preConfigure(int _force) = 0;
  
!     /** Pure virtual method to configure package
       *  Broadly speaking, this is ./configure
       *  \sa Configure()
       *  \return 1 if ok */
--- 152,160 ----
      virtual int preConfigure(int _force) = 0;
  
!     /** Pure virtual method to configure package.
!      *
       *  Broadly speaking, this is ./configure
+      *  \param _curentCompiler Compiler to use
+      *  \param _currentOptions Options to pass to compiler (through configuration mechanism)
       *  \sa Configure()
       *  \return 1 if ok */
***************
*** 147,156 ****
  
      /** Pure virtual method to build package
       *  This could be a simple make, for instance.
       *  \return 1 if ok
       *  \sa Make() */
      virtual int make(void) = 0;
  
!     /** Pure virtual method to clean-up sources
       *  Useful bettween two Make() to get all sources compiled with same environment.
       *  \sa Release()
--- 163,176 ----
  
      /** Pure virtual method to build package
+      *
       *  This could be a simple make, for instance.
+ 
+      *  \param _force set this to 1 to force the build (regardless of package's state).
       *  \return 1 if ok
       *  \sa Make() */
      virtual int make(void) = 0;
  
!     /** Pure virtual method to clean-up sources.
!      *
       *  Useful bettween two Make() to get all sources compiled with same environment.
       *  \sa Release()
***************
*** 159,163 ****
      virtual int release(void) = 0;
  
!     /** Uninstall benchmark
       *  Removes information used by CompBenchmarks as well as any downloaded, extracted
       *  or built element. Default behaviour should be ok in most case.
--- 179,184 ----
      virtual int release(void) = 0;
  
!     /** Uninstall benchmark.
!      *
       *  Removes information used by CompBenchmarks as well as any downloaded, extracted
       *  or built element. Default behaviour should be ok in most case.
***************
*** 165,171 ****
      virtual int uninstall(void);
    
!     /** Gets a context ID
!      *  Give an unique ID according to compiler and options used. This can avoid useless
       *  recompilations.
       *  \return ID (MD5) as std::string
       *  \sa Make()
--- 186,195 ----
      virtual int uninstall(void);
    
!     /** Gets a context ID.
!      *
!      *  Give an unique (probably new) ID according to compiler and options used. This can avoid useless
       *  recompilations.
+      *  \param _currentCompiler Compiler in new context
+      *  \param _currentOptions Options passed to compiler or given as used within the context
       *  \return ID (MD5) as std::string
       *  \sa Make()
***************
*** 176,181 ****
  				  CompilerOptions *_currentOptions);
  
!     /** Stores (compilation) context ID
       *  Stores the context ID for the current benchmark.
       *  \sa contextID()
       *  \sa ContextMatches()
--- 200,208 ----
  				  CompilerOptions *_currentOptions);
  
!     /** Stores (compilation) context ID.
!      *
       *  Stores the context ID for the current benchmark.
+      *  \param _currentCompiler Compiler currently used
+      *  \param _currentOptions Options currently used by compiler
       *  \sa contextID()
       *  \sa ContextMatches()
***************
*** 186,192 ****
--- 213,227 ----
    public:
  
+     /** Removes internal references to a benchmark.
+      *
+      *  References for benchmarks are just removed from internal lists,
+      *  not deleted.
+      *
+      *  \param _benchmark Benchmark to remove.
+      */
      virtual void removeCached(CBM_BM *_benchmark);
  
      /** Indicates if the package needs patching
+      *
       *  Must be overloaded if so. Returns 0 by default.
       *  \return 0 by default, 1 if patch is needed.
***************
*** 197,200 ****
--- 232,236 ----
  
      /** Remove context.
+      *
       *  \sa storeContext()
       */
***************
*** 202,205 ****
--- 238,242 ----
  
      /** Get system abstraction object
+      *
  	\return CBM::System
      */
***************
*** 207,228 ****
  
      /** Get all supported benchmarks.
! 	\return Array of std::string. */
      virtual BenchmarkVector& Benchmarks(void);
  
!     /** Get supported benchmarks' number
! 	\return An integer */
      virtual int benchmarkNumber(void);
  
!     /** Get a benchmark according to its index
! 	\sa Benchmarks()
! 	\return A pointer to the benchmark instance */
      virtual CBM_BM *Benchmark(int i);
  
      /** Get a benchmark according to its identifier.
! 	\return References to a Benchmark object */
      virtual CBM_BM *Benchmark(std::string bid);
    
      /** Stores benchmark status
!      *  Probably internal usage only.
       *  \return 1 if ok
       *  \sa readStatus()
--- 244,275 ----
  
      /** Get all supported benchmarks.
!      *
!      *  \return Array of std::string. */
      virtual BenchmarkVector& Benchmarks(void);
  
!     /** Get supported benchmarks' number.
!      *
!      *  \return An integer */
      virtual int benchmarkNumber(void);
  
!     /** Get a benchmark according to its index.
!      *
!      *  \param i Benchmark's index
!      *  \sa Benchmarks()
!      *  \return A pointer to the benchmark instance */
      virtual CBM_BM *Benchmark(int i);
  
      /** Get a benchmark according to its identifier.
!      *
!      *  \param bid Benchmark identifier
!      *  \return References to a Benchmark object */
      virtual CBM_BM *Benchmark(std::string bid);
    
      /** Stores benchmark status
!      *
!      *  Probably for libcompbenchmarks internal usage only, since calls
!      *  necessary calls aldready exists in higher level classes.
!      *
!      *  \param _status New (current probably) status for the package
       *  \return 1 if ok
       *  \sa readStatus()
***************
*** 230,247 ****
      virtual int storeStatus(Status _status);
  
!     /** Package name
       *  \return a std::string like 'gzip', without quotes */
      virtual std::string Name(void);
  
!     /** Package version
       *  \return a std::string like '1.2.4', without quotes */
      virtual std::string Version(void) = 0;
  
!     /** Package size, in bytes
       *  \return an integer coding the size of package's archive (to download) in bytes.
       */
      virtual int Size(void) = 0;
  
!     /** Package comments
       *  Gives comments about package. Short description, or what ever.
       *  \return comments, as std::string
--- 277,298 ----
      virtual int storeStatus(Status _status);
  
!     /** Package name.
!      *
       *  \return a std::string like 'gzip', without quotes */
      virtual std::string Name(void);
  
!     /** Package version.
!      *
       *  \return a std::string like '1.2.4', without quotes */
      virtual std::string Version(void) = 0;
  
!     /** Package size, in bytes.
!      *
       *  \return an integer coding the size of package's archive (to download) in bytes.
       */
      virtual int Size(void) = 0;
  
!     /** Package comments.
!      *
       *  Gives comments about package. Short description, or what ever.
       *  \return comments, as std::string
***************
*** 249,283 ****
      virtual std::string Comments(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 localName(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 localAbsoluteName(void);
!     /** Convenience method
!      *  \return directory used for extracting package
       *  \sa CBM::System::Extract */
      virtual std::string localAbsoluteDirectory(void);
  
!     /** Relative directory to extract package
       *  \return relative directory to use (or used, depending) for package extraction
       *  \sa CBM::System::Extract */
--- 300,343 ----
      virtual std::string Comments(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 localName(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;
  
!     /** Local absolute archive filename.
!      *
       *  \return local uncompressed absolute archive filename for benchmark.
       *  \sa localPackageName() */
      virtual std::string localAbsoluteName(void);
! 
!     /** Extraction directory.
!      *
!      *  \return directory used for extracting packages (e.g. where packages are uncompressed, compiled, and so on).
       *  \sa CBM::System::Extract */
      virtual std::string localAbsoluteDirectory(void);
  
!     /** Relative directory to extract package.
!      *
       *  \return relative directory to use (or used, depending) for package extraction
       *  \sa CBM::System::Extract */
***************
*** 285,288 ****
--- 345,349 ----
  
      /** 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.
***************
*** 293,296 ****
--- 354,358 ----
  
      /** URL used for downloading package.
+      *
       *  \return std::string representing the URL of the package
       *  \sa expectedMD5() */
***************
*** 298,301 ****
--- 360,364 ----
  
      /** Total size of the package
+      *
       *  \return Total size, in bytes, of thepackage. This comprises data used
       *  in pre-configuration step.
***************
*** 304,309 ****
     virtual int         totalSize(void);
  
!     /** Compairs previous compilation context to current one
!      *  \return 1 if they match.
       *  \sa contextID()
       *  \sa storeContext()
--- 367,375 ----
     virtual int         totalSize(void);
  
!     /** Compairs previous compilation context to current one.
!      *
!      *  \return 1 if contexts match.
!      *  \param _currentCompiler Compiler currently used
!      *  \param _currentOptions Options currently used by compiler
       *  \sa contextID()
       *  \sa storeContext()
***************
*** 313,316 ****
--- 379,383 ----
  				       CompilerOptions *_currentOptions);
      /** Download package.
+      *
       *  Gets downloadURL() object from Internet and verify checksum.
       *  Uses download(). Overloading is unadvised.
***************
*** 322,325 ****
--- 389,393 ----
  
      /** Extract package.
+      *
       *  Extracts downloaded package.
       *  Uses extract(). Overloading is unadvised.
***************
*** 332,335 ****
--- 400,404 ----
  
      /** Patch package.
+      *
       *  Patches extracted package.
       *  Overloading is unadvised, 1 is returned without any action, by default.
***************
*** 343,346 ****
--- 412,416 ----
  
      /** Preconfigure package.
+      *
       *  Preconfigure downloaded package.
       *  Uses preConfigure(). Overloading is unadvised.
***************
*** 354,357 ****
--- 424,428 ----
  
      /** Configure package.
+      *
       *  Configure downloaded package.
       *  Uses configure(). Overloading is unadvised. Argument are used to keep
***************
*** 359,362 ****
--- 430,435 ----
       *  if ./configure script is not present : they'll be used by Make().
       *  This step won't be done and'll return 1 if getStatus()>=Package::Configured. May changes status.
+      *  \param _currentCompiler Compiler to be used
+      *  \param _currentOptions Options to be passed to compiler (through package's configuration mechanism)
       *  \return 1 if ok.
       *  \sa Download()
***************
*** 370,373 ****
--- 443,447 ----
  
      /** Build package.
+      *
       *  Builds package.
       *  Uses make(). Overloading is unadvised.
***************
*** 384,387 ****
--- 458,462 ----
  
      /** Give build time.
+      *
       *  Returns last time (in seconds) of make().
       *  \return build time in seconds
***************
*** 391,394 ****
--- 466,470 ----
  
      /** Test a package.
+      *
       *  Test a built package.
       *  Overloading is unadvised, 1 is returned without any action, by default.
***************
*** 403,406 ****
--- 479,483 ----
  
      /** Clean objects.
+      *
       *  Uses release(). Overloading is unadvised.
       *  This step won't be done and'll return 0 if getStatus()<Package::Made. May changes status.
***************
*** 419,422 ****
--- 496,500 ----
  
      /** Copy a local archive.
+      *
       *  Copy package to directory defined by CBM::System::Download. It'll be ready
       *  to be extracted using Install().
***************
*** 429,432 ****
--- 507,511 ----
  
      /** Uninstall package.
+      *
       *  Uses uninstall(). Overloading is unadvised.
       *  This step won't be done and'll return 1 if getStatus()==Package::Unknown.
***************
*** 436,439 ****
--- 515,519 ----
  
      /** Returns benchmark's status
+      *
       *  \return status (enum).
       *  \sa Package::Status
***************
*** 442,445 ****
--- 522,526 ----
  
      /** Returns benchmark's status
+      *
       *  \return status (as string)
       *  \sa Package::Status

Index: Benchmark-Autotools.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark-Autotools.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Benchmark-Autotools.h	22 Jan 2007 18:21:47 -0000	1.1
--- Benchmark-Autotools.h	4 Sep 2007 19:16:15 -0000	1.2
***************
*** 26,39 ****
    protected:
  
!     /** Extracts package
       *  Extract a gzipped-tarball.
       *  \return 1 if ok.
       *  \sa CBMBenchmark::packageAbsoluteDirectory() */
      virtual int extract(int _force = 0);
!     /** Configure package
! 	Use ./configure script and standard options.
! 	\sa CBMBenchmark::Configure()
! 	\sa CBMBenchmark::language()
! 	\return 1 if ok.
      */
      virtual int configure(Compiler        *_currentCompiler,
--- 26,44 ----
    protected:
  
!     /** Extracts package.
!      *
       *  Extract a gzipped-tarball.
+      *  \param _force 1 to force extraction (even if detected as already done).
       *  \return 1 if ok.
       *  \sa CBMBenchmark::packageAbsoluteDirectory() */
      virtual int extract(int _force = 0);
!     /** Configure package.
!      *
!      *  Use ./configure script and standard options.
!      *  \param _currentCompiler Compiler to pass to ./configure
!      *  \param _currentOptions  Compilation options to use
!      *  \sa CBMBenchmark::Configure()
!      *  \sa CBMBenchmark::language()
!      *  \return 1 if ok.
      */
      virtual int configure(Compiler        *_currentCompiler,
***************
*** 41,56 ****
  
      /** Build package.
! 	Use make.
! 	\return 1 if ok.
! 	\sa CBMBenchmark::make() */
      virtual int make(void);
  
      /** Removes object files.
! 	Use make clean.
! 	\return 1 if ok.
! 	\sa CBMBenchmark::release() */
      virtual int release(void);
  
!     /** Constructor */
      PackageAutotools(class System *_system);
  
--- 46,65 ----
  
      /** Build package.
!      *
!      *  Use make.
!      *  \return 1 if ok.
!      *  \sa CBMBenchmark::make() */
      virtual int make(void);
  
      /** Removes object files.
!      *
!      *  Use make clean.
!      *  \return 1 if ok.
!      *  \sa CBMBenchmark::release() */
      virtual int release(void);
  
!     /** Constructor
!      *
!      *  \param _system A CBM::System instance */
      PackageAutotools(class System *_system);
  

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Base Config.h, 1.10, 1.11 Result.h, 1.3, 1.4 XML.h, 1.8, 1.9

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

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

Modified Files:
	Config.h Result.h XML.h 
Log Message:
For SF's TID #141819 : improving Doxygen documentation.

Index: XML.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/XML.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XML.h	6 Jun 2007 16:00:29 -0000	1.8
--- XML.h	4 Sep 2007 19:15:58 -0000	1.9
***************
*** 23,29 ****
    {
    protected:
!     std::string   name;   /*!< Attribute name */
!     std::string   value;  /*!< Attribute value */
!     class XMLNode *parent;
  
    public:
--- 23,29 ----
    {
    protected:
!     std::string   name;     /*!< Attribute name */
!     std::string   value;    /*!< Attribute value */
!     class XMLNode *parent;  /*!< Parent XML node (attribute's holder) */
  
    public:
***************
*** 123,126 ****
--- 123,127 ----
      /** Get a child node according to its index.
       *
+      *  \param _index Index of node to return.
       *  \return A node
       *  \sa nodeNumber() */
***************
*** 129,136 ****
--- 130,140 ----
      /** Get a child node according to its name.
       *
+      *  \param _name Name of node to return.
       *  \return A node
       *  \sa getChild() */
      virtual XMLNode *getNode(std::string _name);
  
+     /** Returns parent's node.
+      *  \return Pointer to parent XML node */
      virtual XMLNode *getParent(void);
  
***************
*** 143,146 ****
--- 147,151 ----
      /** Get an attribute according to its name.
       *
+      *  \param _name Attribute's name
       *  \return An attribute
       *  \sa getAttribute()() */
***************
*** 148,151 ****
--- 153,157 ----
  
      /** Get an attribute according to its index
+      *  \param _index Attribute's index
       *  \return An attribute
       *  \sa attributeNumber() */

Index: Config.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Config.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Config.h	28 May 2007 18:08:00 -0000	1.10
--- Config.h	4 Sep 2007 19:15:58 -0000	1.11
***************
*** 10,13 ****
--- 10,16 ----
  
  #include <Benchmark/Package.h>
+ #include <Compiler/Compiler.h>
+ #include <Compiler/Compiler-Options.h>
+ 
  #include <System/System.h>
  #include <Base/XML.h>
***************
*** 114,120 ****
       *  time. This prevent re-compilation when performance evaluation on same
       *  compiler/options pairs is asked (e.g. through CBM::Benchmark::Bench().
       *  \param _bid Benchmark's ID
!      *  \param _currrentCompiler Compiler instance
       *  \param _currentOptions Options
       *  \sa contextMatches()
       *  \sa CBM::Compiler
--- 117,125 ----
       *  time. This prevent re-compilation when performance evaluation on same
       *  compiler/options pairs is asked (e.g. through CBM::Benchmark::Bench().
+      *
       *  \param _bid Benchmark's ID
!      *  \param _currentCompiler Compiler instance
       *  \param _currentOptions Options
+      *
       *  \sa contextMatches()
       *  \sa CBM::Compiler
***************
*** 122,127 ****
       *  \sa CBM::Package */
      virtual void setContext(std::string           _bid,
! 			    class Compiler        *_currentCompiler,
! 			    class CompilerOptions *_currentOptions);
  
      /** Retrieve compiler previously used.
--- 127,132 ----
       *  \sa CBM::Package */
      virtual void setContext(std::string           _bid,
! 			    CBM::Compiler         *_currentCompiler,
! 			    CBM::CompilerOptions  *_currentOptions);
  
      /** Retrieve compiler previously used.
***************
*** 145,156 ****
       *  asked to be compilated with same options.
       *  \param _bid Benchmark's ID
!      *  \param _currrentCompiler Compiler instance
       *  \param _currentOptions Options
       *  \return 1 if ok, 0 is context doesn't match.
       *  \sa setContext()
       */
!     virtual int contextMatches(std::string _bid,
! 			       class Compiler        *_currentCompiler,
! 			       class CompilerOptions *_currentOptions);
  
      /** Reset benchmark's context.
--- 150,161 ----
       *  asked to be compilated with same options.
       *  \param _bid Benchmark's ID
!      *  \param _currentCompiler Compiler instance
       *  \param _currentOptions Options
       *  \return 1 if ok, 0 is context doesn't match.
       *  \sa setContext()
       */
!     virtual int contextMatches(std::string          _bid,
! 			       CBM::Compiler        *_currentCompiler,
! 			       CBM::CompilerOptions *_currentOptions);
  
      /** Reset benchmark's context.
***************
*** 166,170 ****
       *  Many default/user set paths are used to store packages, uncompress or compile
       *  them and so on. This method retrieves them.
!      *  \parma dir Directory/Path ID
       *  \return Path as std::string */
      virtual std::string Path(CBM::System::Dir dir);
--- 171,175 ----
       *  Many default/user set paths are used to store packages, uncompress or compile
       *  them and so on. This method retrieves them.
!      *  \param dir Directory/Path ID
       *  \return Path as std::string */
      virtual std::string Path(CBM::System::Dir dir);

Index: Result.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Result.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Result.h	4 Sep 2007 17:06:15 -0000	1.3
--- Result.h	4 Sep 2007 19:15:58 -0000	1.4
***************
*** 32,35 ****
--- 32,41 ----
       *  Constructor mainly builts the associated (internal) XML node with given
       *  values.
+      *
+      *  \param _value benchmark's (performance) value
+      *  \param _compilationTime Compilation time (for package, in ms)
+      *  \param _executionTime Execution time (for benchmark, in ms)
+      *  \param _tested 1 if package can be tested, 0 otherwise
+      *  \param _testOk 1 if package has been tested, 0 otherwise
       */
      Result(std::string _value,
***************
*** 40,43 ****
--- 46,51 ----
  
      /** Create a result object from an XML node.
+      *
+      *  \param _node XML node containing a valid result description.
       */
      Result(XMLNode *_node);

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Base md5.h, 1.2, 1.3

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

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

Modified Files:
	md5.h 
Log Message:
For SF's TID #141819 : documenting (Doxygen).

Index: md5.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/md5.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** md5.h	4 Sep 2007 17:06:15 -0000	1.2
--- md5.h	4 Sep 2007 17:33:49 -0000	1.3
***************
*** 73,79 ****
  /** Define the state of the MD5 Algorithm. */
  typedef struct md5_state_s {
!     md5_word_t count[2];	/*<! message length in bits, lsw first */
!     md5_word_t abcd[4];		/*<! digest buffer */
!     md5_byte_t buf[64];		/*<! accumulate block */
  } md5_state_t;
  
--- 73,79 ----
  /** Define the state of the MD5 Algorithm. */
  typedef struct md5_state_s {
!     md5_word_t count[2];	/*!< message length in bits, lsw first */
!     md5_word_t abcd[4];		/*!< digest buffer */
!     md5_byte_t buf[64];		/*!< accumulate block */
  } md5_state_t;
  
***************
*** 83,93 ****
  #endif
  
! /** Initialize the algorithm. */
  void md5_init(md5_state_t *pms);
    
! /** Append a string to the message. */
  void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
  
!   /** Finish the message and return the digest. */
  void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
  
--- 83,101 ----
  #endif
  
! /** Initialize the algorithm.
!  *  \param pms Pointer to a MD5 state structure. */
  void md5_init(md5_state_t *pms);
    
! /** Append a string to the message.
!  *  \param pms Pointer to a MD5 state structure.
!  *  \param data data to be appendended.
!  *  \param nbytes length (in bytes) of data.
!  */
  void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
  
! /** Finish the message and return the digest.
!  *  \param pms Pointer to a MD5 state structure.
!  *  \param digest Returned MD5 hash for data.
!  *  \sa md5_append */
  void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
  

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Compiler Compiler-Option-Logic.h, 1.2, 1.3

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

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

Modified Files:
	Compiler-Option-Logic.h 
Log Message:
For SF's TID #141819 : documenting (Doxygen).

Index: Compiler-Option-Logic.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Option-Logic.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Compiler-Option-Logic.h	12 Apr 2007 19:55:37 -0000	1.2
--- Compiler-Option-Logic.h	4 Sep 2007 17:33:35 -0000	1.3
***************
*** 13,44 ****
  
  namespace CBM {
    typedef enum CompilerOptionLogicCommandID {
!     Unknown, Exclusive, ImpliedBy, Requires
    };
  
    typedef struct CompilerOptionLogicCommand {
!     CompilerOptionLogicCommandID id;
!     int                          testOption; /* 1 for option, 0 internal */
!     std::string                  internalVarName; /* argumentOption; */
!     std::string                  internalVarValue;
!     std::string                  optionReferred;
    };
  
    class CompilerOptionLogic
    {
    private:
    protected:
      CompilerOptionDescriptions *context;
      CompilerOptionDescription  *description;
  
      std::vector<CompilerOptionLogicCommand*> commands;
  
    public:
      CompilerOptionLogic(CompilerOptionDescriptions *_context,
  			CompilerOptionDescription  *_description,
  			XMLNode                    *_from);
  
      virtual std::string use(void);
  
      virtual ~CompilerOptionLogic();
    };
--- 13,75 ----
  
  namespace CBM {
+   /** Defines logical operators for compiler's option handling logics. */
    typedef enum CompilerOptionLogicCommandID {
!     Unknown,    /*!< Not supported/unknown operator */
!     Exclusive,  /*!< Bijective exclusion operator */
!     ImpliedBy,  /*!< Left item is implied by right one */
!     Requires    /*!< Left item requieres right one */
    };
  
+   /** Define logical commands for compiler's option handling logics. */
    typedef struct CompilerOptionLogicCommand {
!     CompilerOptionLogicCommandID id;               /*!< Operator identifier. */
!     int                          testOption;       /*!< 1 for option, 0 for an internal variable */
!     std::string                  internalVarName;  /*!< variable name */
!     std::string                  internalVarValue; /*!< variable (desired) value */
!     std::string                  optionReferred;   /*!< option's name */
    };
  
+   /** \brief Handles logic for a given compiler's option.
+    *
+    *  The "logic" refers to (in)compatibility, inclusion or dependencies
+    *  between options.
+    *
+    *  \sa use
+    */
    class CompilerOptionLogic
    {
    private:
    protected:
+     /** Internal reference to context. */
      CompilerOptionDescriptions *context;
+     /** Internal reference to option's description. */
      CompilerOptionDescription  *description;
  
+     /** List of commands to be applied.
+      *  \sa use()
+      */
      std::vector<CompilerOptionLogicCommand*> commands;
  
    public:
+     /** Constructor.
+      *  \param _context Whole options' descriptions.
+      *  \param _description Option on which defined logics are applied on.
+      *  \param _from XML description defining logic. */
      CompilerOptionLogic(CompilerOptionDescriptions *_context,
  			CompilerOptionDescription  *_description,
  			XMLNode                    *_from);
  
+     /** Applied/append the option.
+      *
+      *  This method append the option to current options' list (associated
+      *  to context variable) and returns detected faults or remarks as
+      *  an std::string.
+      *
+      *  \return std::string with comments on option's usage within current context.
+      *  \sa context
+      */
      virtual std::string use(void);
  
+     /** Desctructor */
      virtual ~CompilerOptionLogic();
    };

[Compbench-devel] CompBenchmarks++/libcompbenchmarks libcompbenchmarks.h, 1.3, 1.4

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

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

Modified Files:
	libcompbenchmarks.h 
Log Message:
For SF's TID #141819 : documenting (Doxygen).

Index: libcompbenchmarks.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/libcompbenchmarks.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** libcompbenchmarks.h	7 Jun 2007 16:22:31 -0000	1.3
--- libcompbenchmarks.h	4 Sep 2007 17:33:19 -0000	1.4
***************
*** 26,31 ****
  namespace CBM {
  
    typedef enum Verbosity {
!     None, Basic, All
    };
  
--- 26,38 ----
  namespace CBM {
  
+   /** Verbosity of UI
+    *
+    *  Defines verbosity of CBM::UIMsg message objects shown by
+    *  CBM::UI object hierarchy.
+    */
    typedef enum Verbosity {
!     None,  /*!< Disabled (no message). */
!     Basic, /*<! Most messages will be taken in care. */
!     All    /*<! All messages  will be taken in care. */
    };
  
***************
*** 42,45 ****
--- 49,53 ----
    extern Verbosity UO_verbose;
  
+   /** Verbosity flag for dl*() C functions */
    extern int UO_verbose_dl;
  }

[Compbench-devel] CompBenchmarks++/CBM-PI/t 00-CBMSystem-public.pl, 1.11, 1.12

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17844

Modified Files:
	00-CBMSystem-public.pl 
Log Message:
Moved to BETA3.

Index: 00-CBMSystem-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** 00-CBMSystem-public.pl	6 Jun 2007 19:23:24 -0000	1.11
--- 00-CBMSystem-public.pl	4 Sep 2007 17:08:21 -0000	1.12
***************
*** 165,169 ****
  test_getLastCommand();
  test_getLastCommandOutput();
! ok($sys->Version() eq "0.5.0-BETA2");
  
  $sys->done();
--- 165,169 ----
  test_getLastCommand();
  test_getLastCommandOutput();
! ok($sys->Version() eq "0.5.0-BETA3");
  
  $sys->done();

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Base md5.h, 1.1, 1.2 Result.h, 1.2, 1.3 Thread.h, 1.3, 1.4

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

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

Modified Files:
	md5.h Result.h Thread.h 
Log Message:
For SF's TID #141819 : documenting (Doxygen).

Index: Thread.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Thread.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Thread.h	4 Sep 2007 16:56:23 -0000	1.3
--- Thread.h	4 Sep 2007 17:06:15 -0000	1.4
***************
*** 39,43 ****
    };
    
!   /** \brief Class for managing threads.
     *
     * Uses pthread's threads.
--- 39,43 ----
    };
    
!   /** \brief Class for spawning and managing a thread.
     *
     * Uses pthread's threads.
***************
*** 45,66 ****
--- 45,102 ----
    class Thread {
    private:
+     /** Internal thread identifier (pthread). */
      pthread_t tid;
+     /** Internal terminaison status.
+      *  \sa Terminated() */
+ 
      int       isTerminated;
+     /** Internal mutex preventing cross accesses to internal variables. */
      Mutex     mutex;
      
    protected:
+     /** Pick internal mutex. */
      virtual void P(void);
+     /** Restore/release internal mutex. */
      virtual void R(void);
+     /** Waiting for thread to be joined. */
      virtual void join(void);
    
    public:
+     /** Constructor.
+      *  \sa routine()
+      *  \sa Start() */
      Thread();
      
+     /** Thread's routine.
+      *
+      *  This abstract method must be overloaded and should defines code that'll have
+      *  to be executed in the separated thread. */
      virtual void routine(void) = 0;
+ 
+     /** Set isTerminated to 1 (yes).
+      *  \sa isTerminated.
+      */
      virtual void terminated(void);
+ 
+     /** Returns if the thread is terminated.
+      *  \sa terminated
+      *  \sa isTerminated
+      *  \return 1 if thread is terminated, 0 otherwise.
+      */
      virtual int Terminated(void);
  
+     /** Thread's progress.
+      *
+      *  Returns thread progress (as percentage).
+      *
+      *  \returns 0.0f (has to be modified, on purpose).
+      */
      virtual float Progress(void);
  
+     /** Start the thread.
+      *
+      * Execute routine() in a separated thread.
+      * \sa routine()
+      */
      virtual void Start(void);
      
***************
*** 70,84 ****
--- 106,134 ----
  
  
+   /** Basic class for implementing an action.
+    *
+    *  This class is currently given just for convenience since it just makes
+    *  Progress() a pure virtual method - to not forget overloading it.
+    */
    class ThreadAction : public Thread {
    private:
    protected:
+     /** Constructor */
      ThreadAction();
  
    public:
+     /** Thread's progress.
+      *
+      *  Overloads to get a float representing advancement percentage
+      *  (from 0 to 100.0).
+      *
+      *  \return Nothing. Needs overloading. */
      virtual float Progress(void) = 0;
  
+     /** Destructor */
      ~ThreadAction();
    };
  
+   /** Returns pointer to current's thread. */
    pthread_t currentThread(void);
  }

Index: md5.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/md5.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** md5.h	22 Jan 2007 17:46:28 -0000	1.1
--- md5.h	4 Sep 2007 17:06:15 -0000	1.2
***************
*** 51,55 ****
  #  define md5_INCLUDED
  
! /*
   * This package supports both compile-time and run-time determination of CPU
   * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
--- 51,55 ----
  #  define md5_INCLUDED
  
! /**
   * This package supports both compile-time and run-time determination of CPU
   * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
***************
*** 59,72 ****
   * run on either big- or little-endian CPUs, but will run slightly less
   * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
   */
  
! typedef unsigned char md5_byte_t; /* 8-bit byte */
! typedef unsigned int md5_word_t; /* 32-bit word */
  
! /* Define the state of the MD5 Algorithm. */
  typedef struct md5_state_s {
!     md5_word_t count[2];	/* message length in bits, lsw first */
!     md5_word_t abcd[4];		/* digest buffer */
!     md5_byte_t buf[64];		/* accumulate block */
  } md5_state_t;
  
--- 59,79 ----
   * run on either big- or little-endian CPUs, but will run slightly less
   * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+  *
+  * Comments and help from former package :
+  *
+  * Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+  * 
+  * L. Peter Deutsch
+  * gh...@al...
   */
  
! typedef unsigned char md5_byte_t; /*<! 8-bit byte */
! typedef unsigned int md5_word_t; /*<! 32-bit word */
  
! /** Define the state of the MD5 Algorithm. */
  typedef struct md5_state_s {
!     md5_word_t count[2];	/*<! message length in bits, lsw first */
!     md5_word_t abcd[4];		/*<! digest buffer */
!     md5_byte_t buf[64];		/*<! accumulate block */
  } md5_state_t;
  
***************
*** 76,86 ****
  #endif
  
! /* Initialize the algorithm. */
  void md5_init(md5_state_t *pms);
! 
! /* Append a string to the message. */
  void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
  
! /* Finish the message and return the digest. */
  void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
  
--- 83,93 ----
  #endif
  
! /** Initialize the algorithm. */
  void md5_init(md5_state_t *pms);
!   
! /** Append a string to the message. */
  void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
  
!   /** Finish the message and return the digest. */
  void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
  

Index: Result.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Result.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Result.h	23 May 2007 15:28:04 -0000	1.2
--- Result.h	4 Sep 2007 17:06:15 -0000	1.3
***************
*** 12,23 ****
  
  namespace CBM {
!   /** \brief Class for storing and managing result
     */
    class Result {
    protected:
      XMLNode     *node;
  
      virtual std::string getAttributeStr(std::string _attr);
    public:
      Result(std::string _value,
  	   std::string _compilationTime,
--- 12,36 ----
  
  namespace CBM {
!   /** \brief Class for storing and managing benchmark's results
     */
    class Result {
    protected:
+     /** Internal XML representation. */
      XMLNode     *node;
  
+     /** Get (XML) attribute for current result.
+      *
+      * Internal convenience method to get attribute (value, compilation time, and
+      * so on) for the result.
+      *
+      * \param _attr Attribute's internal name
+      * \return The attribute's value as an std::string. */
      virtual std::string getAttributeStr(std::string _attr);
    public:
+     /** Creates a result object.
+      *
+      *  Constructor mainly builts the associated (internal) XML node with given
+      *  values.
+      */
      Result(std::string _value,
  	   std::string _compilationTime,
***************
*** 26,40 ****
  	   std::string _testOk);
  
      Result(XMLNode *_node);
  
      virtual std::string Value(void);
      virtual std::string compilationTime(void);
      virtual std::string executionTime(void);
      virtual std::string tested(void);
      virtual std::string testOk(void);
  
      virtual XMLNode *resultNode(void);
  
!     /** Destructor  */
      virtual ~Result();
    };
--- 39,83 ----
  	   std::string _testOk);
  
+     /** Create a result object from an XML node.
+      */
      Result(XMLNode *_node);
  
+     /** Returns benchmark's value.
+      *  \sa getAttributeStr()
+      *  \return Benchmark's value as an std::string */
      virtual std::string Value(void);
+ 
+     /** Returns package's compilation time.
+      *  \sa getAttributeStr()
+      *  \return Compilation time (in ms) as an std::string */
      virtual std::string compilationTime(void);
+ 
+     /** Returns package's execution time.
+      *  \sa getAttributeStr()
+      *  \return Execution time (in ms) as an std::string */
      virtual std::string executionTime(void);
+ 
+     /** Returns if the package has to be tested or not.
+      *  \sa getAttributeStr()
+      *  \return A "1" std::string if the package has to be tested, "0" otherwise. */
      virtual std::string tested(void);
+ 
+     /** Returns if the package has been tested or not.
+      *  \sa getAttributeStr()
+      *  \return A "1" std::string if the package has been tested, "0" otherwise. */
      virtual std::string testOk(void);
  
+     /** Returns XML node.
+      *
+      *  Give internal XML representation of the result.
+      *  \return Result's XMLNode.
+      *  \sa node
+      */
      virtual XMLNode *resultNode(void);
  
!     /** Destructor
!      *
!      *  Destroys node.
!      *  \sa node */
      virtual ~Result();
    };

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Base Thread.cpp, 1.2, 1.3

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

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

Modified Files:
	Thread.cpp 
Log Message:
Few advances on comments and documentation.

Index: Thread.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Thread.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Thread.cpp	6 Jun 2007 16:01:08 -0000	1.2
--- Thread.cpp	4 Sep 2007 16:56:39 -0000	1.3
***************
*** 114,150 ****
  }
  
- ThreadActionTest::ThreadActionTest()
-   : ThreadAction()
- {
-   slp=5;
- }
- 
- void ThreadActionTest::routine(void)
- {
-   int loc = slp;
- 
-   while (loc--) {
-     m.Lock();
-     slp=loc;
-     m.Unlock();
-     sleep(1);
-   }
- }
- 
- float ThreadActionTest::Progress(void)
- {
-   int loc;
- 
-   m.Lock();
-   loc=slp;
-   m.Unlock();
- 
-   return((5-loc)/.05);
- }
- 
- ThreadActionTest::~ThreadActionTest(void)
- {
- }
- 
  pthread_t CBM::currentThread(void)
  {
--- 114,117 ----

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Base Thread.h, 1.2, 1.3

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

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

Modified Files:
	Thread.h 
Log Message:
Obsolete code removed.
Few advances on comments and documentation.

Index: Thread.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Thread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Thread.h	6 Jun 2007 16:01:09 -0000	1.2
--- Thread.h	4 Sep 2007 16:56:23 -0000	1.3
***************
*** 12,29 ****
  
  namespace CBM {
!   /** \brief Class for storing and managing threads
     */
    class Mutex {
    private:
      pthread_mutex_t mutex;
      
    public:
      Mutex();
      virtual void Lock(void);
      virtual void Unlock(void);
      
      virtual ~Mutex();
    };
    
    class Thread {
    private:
--- 12,46 ----
  
  namespace CBM {
!   /** \brief Class for storing and managing pthread's mutexes.
     */
    class Mutex {
    private:
+     /** Internal pthread mutex object. */
      pthread_mutex_t mutex;
      
    public:
+     /** Constructor */
      Mutex();
+ 
+     /** Locks mutex.
+      *
+      * Locks or wait for mutex availability (to take/lock it).
+      */
      virtual void Lock(void);
+ 
+     /** Unlocks mutex. */
      virtual void Unlock(void);
      
+     /** Destructor.
+      *
+      *  Destroy internal pthread mutex.
+      *  \sa mutex */
      virtual ~Mutex();
    };
    
+   /** \brief Class for managing threads.
+    *
+    * Uses pthread's threads.
+    */
    class Thread {
    private:
***************
*** 64,83 ****
    };
  
-   class ThreadActionTest : public ThreadAction {
-   private:
-     int slp;
-     Mutex m;
- 
-   protected:
-     virtual void routine(void);
- 
-   public:
-     ThreadActionTest();
- 
-     virtual float Progress(void);
- 
-     ~ThreadActionTest();
-   };
- 
    pthread_t currentThread(void);
  }
--- 81,84 ----

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Plan Plan-Batch.cpp, 1.12, 1.13

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

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

Modified Files:
	Plan-Batch.cpp 
Log Message:
Closes SF's TID #141670 : SEGFAULTs if invalid compiler given within a <compilers/> tag of an XML plan file.

Index: Plan-Batch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Plan-Batch.cpp	21 Aug 2007 19:49:45 -0000	1.12
--- Plan-Batch.cpp	4 Sep 2007 16:38:14 -0000	1.13
***************
*** 188,192 ****
        continue;
      C=SC->select((char*) A->Value().c_str());
!     add(C);
    }
    delete(SC);
--- 188,193 ----
        continue;
      C=SC->select((char*) A->Value().c_str());
!     if (C)
!       add(C);
    }
    delete(SC);

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.13, 1.14 Package.cpp, 1.14, 1.15

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

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

Modified Files:
	Benchmark.cpp Package.cpp 
Log Message:
Closes SF's TID #141701 : SEGFAULTs if choosen compiler's language doesn't not match package's.

Index: Package.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Package.cpp	6 Jun 2007 15:59:47 -0000	1.14
--- Package.cpp	4 Sep 2007 16:33:32 -0000	1.15
***************
*** 356,362 ****
  
    if (language()!=_currentCompiler->Language()) {
- 
-     storeContext(_currentCompiler,
- 		 _currentOptions);
      info=_currentCompiler->Binary();
      info+=" is a ";
--- 356,359 ----

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Benchmark.cpp	2 Aug 2007 17:06:51 -0000	1.13
--- Benchmark.cpp	4 Sep 2007 16:33:32 -0000	1.14
***************
*** 78,85 ****
  
    if (!p_cm) {
!     Package()->Configure(C, O);
!     Package()->Make(UO_force);
!     r_buildTime=Package()->buildTime();
!     r_test=Package()->Test(UO_force) ? "1" : "0";
    }
  
--- 78,87 ----
  
    if (!p_cm) {
!     if (Package()->Configure(C, O)) {
!       Package()->Make(UO_force);
!       r_buildTime=Package()->buildTime();
!       r_test=Package()->Test(UO_force) ? "1" : "0";
!     } else
!       return(0);
    }
  

[Compbench-devel] CompBenchmarks++/compbenchmarks-core cloptions.cpp, 1.8, 1.9

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

Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1002

Modified Files:
	cloptions.cpp 
Log Message:
Minor cosmetic fix in -h.

Index: cloptions.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core/cloptions.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cloptions.cpp	4 Sep 2007 16:20:17 -0000	1.8
--- cloptions.cpp	4 Sep 2007 16:23:19 -0000	1.9
***************
*** 67,72 ****
      	    << "  --host | -H                     : display informations about host" << std::endl
      	    << "  --programs | -x                 : display informations about" << std::endl
! 	    << "  -A (with -c <compiler>)         : analyze options given to compiler" << std::endl
! 	    << "                                    external programs used" << std::endl << std::endl
  	    << "Management options (with -m or --manage domain) :" << std::endl
  	    << "  --install | -I                  : install package" << std::endl
--- 67,73 ----
      	    << "  --host | -H                     : display informations about host" << std::endl
      	    << "  --programs | -x                 : display informations about" << std::endl
! 	    << "                                    external programs used" << std::endl
! 	    << "  --options-analyze | -A          : analyze options given to compiler" << std::endl << std::endl
! 
  	    << "Management options (with -m or --manage domain) :" << std::endl
  	    << "  --install | -I                  : install package" << std::endl

[Compbench-devel] CompBenchmarks++/compbenchmarks-core cloptions.cpp, 1.7, 1.8

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

Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32361

Modified Files:
	cloptions.cpp 
Log Message:
Closes SF's TID #141820 : -A option shown in help.

Index: cloptions.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core/cloptions.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cloptions.cpp	22 Aug 2007 17:04:05 -0000	1.7
--- cloptions.cpp	4 Sep 2007 16:20:17 -0000	1.8
***************
*** 67,70 ****
--- 67,71 ----
      	    << "  --host | -H                     : display informations about host" << std::endl
      	    << "  --programs | -x                 : display informations about" << std::endl
+ 	    << "  -A (with -c <compiler>)         : analyze options given to compiler" << std::endl
  	    << "                                    external programs used" << std::endl << std::endl
  	    << "Management options (with -m or --manage domain) :" << std::endl

[Compbench-devel] CompBenchmarks++/Qt-4/Status Status.cpp, 1.2, 1.3 Status.h, 1.2, 1.3

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

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Status
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25562/Status

Modified Files:
	Status.cpp Status.h 
Log Message:
Modifications due to changes in libcompbenchmarks. Commited to release BETA2.


Index: Status.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status.h	16 May 2007 20:25:30 -0000	1.2
--- Status.h	29 Aug 2007 20:34:06 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  
  #include <UI/UI.h>
+ #include <UI/UI-Msg.h>
  
  #include <QWidget>
***************
*** 12,16 ****
  #include <Package/PackageHolder.h>
  
! Q_DECLARE_METATYPE(CBM::UI::State)
  
  namespace CQT {
--- 13,17 ----
  #include <Package/PackageHolder.h>
  
! Q_DECLARE_METATYPE(CBM::UIMsg)
  
  namespace CQT {
***************
*** 27,44 ****
  
    signals:
!     virtual void sigProgressInit(QString what);
!     virtual void sigProgress(float _p);
!     virtual void sigProgressDone(void);
!     virtual void sigUninstall(CBM::UI::State state);
!     virtual void sigCompilerAutodetect(CBM::UI::State state,
! 				       float _p);
  
    protected slots:
!     virtual void progressInit(QString what);
!     virtual void progress(float _p);
!     virtual void progressDone(void);
!     virtual void uninstall(CBM::UI::State state);
!     virtual void compilerAutodetect(CBM::UI::State state,
! 				    float _p);
  
    public:
--- 28,39 ----
  
    signals:
!     virtual void sigMessageShow(CBM::UIMsg *msg);
!     virtual void sigMessageProgress(CBM::UIMsg *msg);
!     virtual void sigMessageDone(CBM::UIMsg *msg);
  
    protected slots:
!     virtual void uiMessageShow(CBM::UIMsg *msg);
!     virtual void uiMessageProgress(CBM::UIMsg *msg);
!     virtual void uiMessageDone(CBM::UIMsg *msg);
  
    public:
***************
*** 46,57 ****
  
    public:
!     virtual void ProgressInit(std::string what);
!     virtual void Progress(float _p);
!     virtual void ProgressDone(void);
! 
!     virtual int Information(CBM::UI::Info type,
! 			    std::string   msg,
! 			    CBM::UI::State state,
! 			    float _progress = 0);
  
    public:
--- 41,47 ----
  
    public:
!     virtual void Display(CBM::UIMsg *_msg);
!     virtual void DisplayProgressUpdate(CBM::UIMsg *_msg);
!     virtual void DisplayDone(CBM::UIMsg *_msg);
  
    public:
***************
*** 59,80 ****
    };
  
!   class StatusLedText : public QWidget {
    private:
      Q_OBJECT
  
    public:
!     typedef enum { Waiting,
! 		   Running,
  		   OK,
                     KO } LedColor;
    private:
!     QPixmap  pixmapWaiting;
!     QPixmap  pixmapOK;
!     QPixmap  pixmapKO;
!     QPixmap  pixmapRunning;
  
!     LedColor ledColor;
!     QLabel   *icon;
!     QLabel   *label;
  
      QPixmap  *pixmapObject(LedColor _color);
--- 49,72 ----
    };
  
!   class StatusAction : public QWidget {
    private:
      Q_OBJECT
  
    public:
!     typedef enum { Running,
! 		   Fatal,
  		   OK,
                     KO } LedColor;
    private:
!     QPixmap      pixmapOK;
!     QPixmap      pixmapKO;
!     QPixmap      pixmapRunning;
  
!     LedColor     ledColor;
!     QLabel       *icon;
!     QLabel       *label;
!     QProgressBar *progressBar;
! 
!     CBM::UIMsg *msg;
  
      QPixmap  *pixmapObject(LedColor _color);
***************
*** 82,88 ****
      
    public:
!     StatusLedText(std::string _label,
! 		  LedColor _color = Waiting,
! 		  QWidget *_parent = 0);
  
    public slots:
--- 74,79 ----
      
    public:
!     StatusAction(CBM::UIMsg *_msg,
! 		 QWidget *_parent = 0);
  
    public slots:
***************
*** 92,143 ****
  
  
!     virtual ~StatusLedText();
!   };
! 
!   class StatusInstall : public StatusWidget,
!                         public PackageHolder
!   {
!   private:
!     Q_OBJECT
!     StatusLedText *ledDownloaded;
!     StatusLedText *ledChecksum;
!     StatusLedText *ledExtracted;
!     StatusLedText *ledPatched;
!     StatusLedText *ledPreconfigured;
!     int           ledIndex;
! 
!     StatusLedText *ledCreate(std::string _label,
! 			     int         _done);
! 
!     CQT::StatusLedText::LedColor colorFor(CBM::UI::State state);
! 
!   signals:
!     void sigDownload(CBM::UI::State state,
! 		     float          progress);
!     void sigChecksum(CBM::UI::State state);
!     void sigExtract(CBM::UI::State state);
!     void sigPatch(CBM::UI::State state);
!     void sigPreconfigure(CBM::UI::State state,
! 			 float          progress);
! 
!   protected slots:
!     void download(CBM::UI::State state,
! 		  float          _progress);
!     void checksum(CBM::UI::State state);
!     void extract(CBM::UI::State state);
!     void patch(CBM::UI::State state);
!     void preconfigure(CBM::UI::State state,
! 		      float          _progress);
! 
!   public:
!     StatusInstall(CBM::Package *_package, QWidget *parent = 0);
!     
!     // virtual void ProgressDone(void);
!     virtual int Information(CBM::UI::Info type,
! 			    std::string   msg,
! 			    CBM::UI::State state,
! 			    float _progress = 0);
! 
!     ~StatusInstall();
    };
  }
--- 83,87 ----
  
  
!     virtual ~StatusAction();
    };
  }

Index: Status.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status.cpp	16 May 2007 20:25:30 -0000	1.2
--- Status.cpp	29 Aug 2007 20:34:06 -0000	1.3
***************
*** 27,118 ****
  
    progressBar->setRange(0,100);
!   connect(this, SIGNAL(sigProgressInit(QString)),
! 	  this, SLOT(progressInit(QString)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigProgress(float)),
! 	  this, SLOT(progress(float)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigProgressDone()),
! 	  this, SLOT(progressDone()),
  	  Qt::QueuedConnection);
  
!   connect(this, SIGNAL(sigUninstall(CBM::UI::State)),
! 	  this, SLOT(uninstall(CBM::UI::State)),
  	  Qt::QueuedConnection);
  
!   connect(this, SIGNAL(sigCompilerAutodetect(CBM::UI::State, float)),
! 	  this, SLOT(compilerAutodetect(CBM::UI::State, float)),
  	  Qt::QueuedConnection);
  }
  
! void StatusWidget::progressInit(QString what)
! {
!   actionLabel->setText(what);
!   progressBar->setValue(0);
! }
! 
! void StatusWidget::progress(float _p)
! {
!   int r = (int) round(_p);
!   progressBar->setValue(r);
! }
! 
! void StatusWidget::progressDone(void)
! {
!   progressBar->setValue(100);
! }
! 
! void StatusWidget::ProgressInit(std::string what)
  {
-   emit sigProgressInit(what.c_str());
  }
  
! void StatusWidget::Progress(float _p)
  {
-   emit sigProgress(_p);
  }
  
! void StatusWidget::ProgressDone(void)
  {
-   emit sigProgressDone();
  }
  
! void StatusWidget::uninstall(CBM::UI::State state)
  {
!   actionLabel->setText("Uninstalling package...");
  }
  
! 	  
! void StatusWidget::compilerAutodetect(CBM::UI::State state,
! 				      float _p)
  {
!   if (state==CBM::UI::Start)
!     ProgressInit("Detecting installed compilers...");
!   else {
!     if (state==CBM::UI::Running)
!       Progress(_p);
!     else
!       ProgressDone();
!   }
  }
  
! int StatusWidget::Information(CBM::UI::Info  type,
! 			      std::string    msg,
! 			      CBM::UI::State state,
! 			      float          _progress)
  {
!   switch(type) {
!   case PackageUninstall:
!     emit sigUninstall(state);
!     break;
!   case CompilerAutodetect:
!     emit sigCompilerAutodetect(state, _progress);
!   default:
!     break;
!   }
! 
!   return(0);
  }
  
--- 27,68 ----
  
    progressBar->setRange(0,100);
!   connect(this, SIGNAL(sigMessageShow(CBM::UIMsg*)),
! 	  this, SLOT(uiMessageShow(CBM::UIMsg*)),
  	  Qt::QueuedConnection);
  
!   connect(this, SIGNAL(sigMessageProgress(CBM::UIMsg*)),
! 	  this, SLOT(uiMessageProgress(CBM::UIMsg*)),
  	  Qt::QueuedConnection);
  
!   connect(this, SIGNAL(sigMessageDone(CBM::UIMsg*)),
! 	  this, SLOT(uiMessageDone(CBM::UIMsg*)),
  	  Qt::QueuedConnection);
  }
  
! void StatusWidget::uiMessageShow(CBM::UIMsg *msg)
  {
  }
  
! void StatusWidget::uiMessageProgress(CBM::UIMsg *msg)
  {
  }
  
! void StatusWidget::uiMessageDone(CBM::UIMsg *msg)
  {
  }
  
! void StatusWidget::Display(CBM::UIMsg *_msg)
  {
!   emit sigMessageShow(_msg);
  }
  
! void StatusWidget::DisplayProgressUpdate(CBM::UIMsg *_msg)
  {
!   emit sigMessageProgress(_msg);
  }
  
! void StatusWidget::DisplayDone(CBM::UIMsg *_msg)
  {
!   emit sigMessageDone(_msg);
  }
  
***************
*** 121,149 ****
  }
  
! StatusLedText::StatusLedText(std::string _label,
! 			     LedColor _color,
! 			     QWidget *_parent)
    : QWidget(_parent)
  {
    QHBoxLayout *lay = new QHBoxLayout;
  
!   QIcon I(":/icons/led-yellow.png");
!   pixmapWaiting=I.pixmap(12);
! 
!   QIcon I2(":/icons/success.png");
!   pixmapOK=I2.pixmap(12);
  
!   QIcon I3(":/icons/error.png");
!   pixmapKO=I3.pixmap(12);
  
!   QIcon I4(":/icons/arrow-right.png");
!   pixmapRunning=I4.pixmap(12);
  
    icon=new QLabel();
!   icon->setPixmap(*pixmapObject(_color));
    lay->addWidget(icon);
    icon->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
  
!   label=new QLabel(_label.c_str());
    lay->addWidget(label);
    label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
--- 71,101 ----
  }
  
! StatusAction::StatusAction(CBM::UIMsg *_msg,
! 			   QWidget *_parent)
    : QWidget(_parent)
  {
    QHBoxLayout *lay = new QHBoxLayout;
  
!   msg=_msg;
!   QIcon I1(":/icons/success.png");
!   pixmapOK=I1.pixmap(12);
  
!   QIcon I2(":/icons/error.png");
!   pixmapKO=I2.pixmap(12);
  
!   QIcon I3(":/icons/arrow-right.png");
!   pixmapRunning=I3.pixmap(12);
  
    icon=new QLabel();
!   icon->setPixmap(*pixmapObject(Running));
    lay->addWidget(icon);
    icon->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
  
!   if (_msg->getFlags()==CBM::UIMsg::Progress) {
!     progressBar=new QProgressBar();
!     progressBar->setRange(0,100);
!     lay->addWidget(progressBar);
!   }
!   label=new QLabel("test...!!!");
    lay->addWidget(label);
    label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
***************
*** 153,162 ****
  }
  
! QPixmap *StatusLedText::pixmapObject(LedColor _color)
  {
    switch(_color) {
-   case Waiting:
-     return(&pixmapWaiting);
-     break;
    case Running:
      return(&pixmapRunning);
--- 105,111 ----
  }
  
! QPixmap *StatusAction::pixmapObject(LedColor _color)
  {
    switch(_color) {
    case Running:
      return(&pixmapRunning);
***************
*** 172,176 ****
  }
  
! void StatusLedText::changeColor(LedColor _color)
  {
    icon->setPixmap(*pixmapObject(_color));
--- 121,125 ----
  }
  
! void StatusAction::changeColor(LedColor _color)
  {
    icon->setPixmap(*pixmapObject(_color));
***************
*** 178,334 ****
  
  
! StatusLedText::~StatusLedText()
! {
! }
! 
! StatusInstall::StatusInstall(CBM::Package *_package,
! 			     QWidget *parent)
!   : StatusWidget(parent),
!     PackageHolder(_package)
! {
!   std::string tit = "Installing package ";
!   tit+=Package()->Name();
!   ProgressInit(tit);
!   ledIndex=1;
! 
!   ledDownloaded=ledCreate("Downloading",
! 			  (Package()->getStatus()>=CBM::Package::Downloaded));
! 
!   ledChecksum=ledCreate("Checksum",
! 			(Package()->getStatus()>=CBM::Package::Downloaded));
! 
!   ledExtracted=ledCreate("Extracting",
! 			 (Package()->getStatus()>=CBM::Package::Extracted));
!   ledPatched=0;
!   if (Package()->hasPatch()) {
!     ledPatched=ledCreate("Patching",
!        (Package()->getStatus()>=CBM::Package::Patched));
!   }
! 
! 
!   ledPreconfigured=ledCreate("Preconfiguring",
! 			     (Package()->getStatus()>=CBM::Package::Preconfigured));
! 
!   connect(this, SIGNAL(sigDownload(CBM::UI::State, float)),
! 	  this, SLOT(download(CBM::UI::State, float)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigChecksum(CBM::UI::State)),
! 	  this, SLOT(checksum(CBM::UI::State)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigExtract(CBM::UI::State)),
! 	  this, SLOT(extract(CBM::UI::State)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPatch(CBM::UI::State)),
! 	  this, SLOT(patch(CBM::UI::State)),
! 	  Qt::QueuedConnection);
! 
!   connect(this, SIGNAL(sigPreconfigure(CBM::UI::State, float)),
! 	  this, SLOT(preconfigure(CBM::UI::State, float)),
! 	  Qt::QueuedConnection);
! }
! 
! 
! StatusLedText *StatusInstall::ledCreate(std::string _label,
! 					int         _done)
! {
!   StatusLedText *R;
! 
!   ledIndex++;
!   R = new StatusLedText(_label,
! 			_done ? StatusLedText::OK : StatusLedText::Waiting);
! 
!   layout->addWidget(R, ledIndex, 1, 1, 1, Qt::AlignLeft);
!   return(R);
! }
! 
! CQT::StatusLedText::LedColor StatusInstall::colorFor(CBM::UI::State state)
! {
!   switch(state) {
!   case CBM::UI::Start:
!   case CBM::UI::Running:
!     return(StatusLedText::Running);
!     break;
!   case CBM::UI::OK:
!     return(StatusLedText::OK);
!     break;
!  case CBM::UI::Failed:
!     return(StatusLedText::KO);
!     break;
!   default:
!     return(StatusLedText::Waiting);
!   }
!   return(StatusLedText::Waiting);
! }
! 
! void StatusInstall::download(CBM::UI::State state, float _progress)
! {
!   ledDownloaded->changeColor(colorFor(state));
!   if (_progress>0)
!     Progress(_progress);
! }
! 
! void StatusInstall::checksum(CBM::UI::State state)
! {
!   ledChecksum->changeColor(colorFor(state));
! }
! 
! void StatusInstall::extract(CBM::UI::State state)
! {
!   ledExtracted->changeColor(colorFor(state));
! }
! 
! void StatusInstall::patch(CBM::UI::State state)
! {
!   ledPatched->changeColor(colorFor(state));
! }
! 
! void StatusInstall::preconfigure(CBM::UI::State state, float _progress)
! {
!   ledPreconfigured->changeColor(colorFor(state));
!   if (_progress>0)
!     Progress(_progress);
! }
! /*
! void StatusInstall::ProgressDone(void)
! {
!   StatusWidget::ProgressDone();
!   emit sigDownloaded();
! }
! */
! 
! int StatusInstall::Information(CBM::UI::Info  type,
! 			       std::string    msg,
! 			       CBM::UI::State state,
! 			       float          _progress)
! {
!   switch(type) {
!   case Checksum:
!     emit sigChecksum(state);
!     break;
!   case PackageDownload:
!     emit sigDownload(state, _progress);
!     break;
!   case PackageExtract:
!     emit sigExtract(state);
!     break;
!   case PackagePatch:
!     emit sigPatch(state);
!     break;
!   case PackagePreconfigure:
!     if (_progress==0)
!       Progress(0);
!     emit sigPreconfigure(state, _progress);
!     break;
!   default:
!     break;
!   }
! 
!   return(0);
! }
! 
! StatusInstall::~StatusInstall()
  {
  }
--- 127,131 ----
  
  
! StatusAction::~StatusAction()
  {
  }

[Compbench-devel] CompBenchmarks++/Qt-4/Plan PlanDefineBatch.cpp, 1.8, 1.9

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

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25562/Plan

Modified Files:
	PlanDefineBatch.cpp 
Log Message:
Modifications due to changes in libcompbenchmarks. Commited to release BETA2.


Index: PlanDefineBatch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PlanDefineBatch.cpp	31 Jul 2007 17:28:22 -0000	1.8
--- PlanDefineBatch.cpp	29 Aug 2007 20:34:06 -0000	1.9
***************
*** 60,65 ****
    n+="Batch ";
    n+=c;
!   CBM::PlanBatch *P = new CBM::PlanBatch(n);
!   App->planBatchRegister(P);
  }
  
--- 60,65 ----
    n+="Batch ";
    n+=c;
!   // CBM::PlanBatch *P = new CBM::PlanBatch(n); !!!
!   //  App->planBatchRegister(P);
  }
  

[Compbench-devel] CompBenchmarks++/Qt-4 compbenchmarks-ui-qt4.pro, 1.6, 1.7 main.cpp, 1.8, 1.9

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

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25562

Modified Files:
	compbenchmarks-ui-qt4.pro main.cpp 
Log Message:
Modifications due to changes in libcompbenchmarks. Commited to release BETA2.


Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.cpp	22 May 2007 17:26:06 -0000	1.8
--- main.cpp	29 Aug 2007 20:34:06 -0000	1.9
***************
*** 86,89 ****
--- 86,90 ----
    int i;
  
+   /*
    CBM::cbmUI->Information(CBM::UI::CompilerAutodetect,
  			  "",
***************
*** 107,110 ****
--- 108,112 ----
    if (parent())
      parent()->deleteLater();
+   */
  }
  
***************
*** 121,125 ****
    App=this;
  
!   qRegisterMetaType<CBM::UI::State>("CBM::UI::State");
    qRegisterMetaType<CBM::Package*>("CBM::Package*");
  
--- 123,127 ----
    App=this;
  
!   qRegisterMetaType<CBM::UIMsg*>("CBM::UIMsg*");
    qRegisterMetaType<CBM::Package*>("CBM::Package*");
  
***************
*** 228,238 ****
  void Application::doPackageInstallation(CBM::Package *_package)
  {
!   StatusWidget         *W;
    PackageInstallThread *T;
  
!   W=new StatusInstall(_package);
  
!   W->show();
!   T=new PackageInstallThread(_package, W);
    T->start();
  }
--- 230,240 ----
  void Application::doPackageInstallation(CBM::Package *_package)
  {
!   // StatusWidget         *W;
    PackageInstallThread *T;
  
!   // W=new StatusInstall(_package);
  
!   // W->show();
!   T=new PackageInstallThread(_package);
    T->start();
  }
***************
*** 240,250 ****
  void Application::doPackageUninstallation(CBM::Package *_package)
  {
!   StatusWidget           *W;
    PackageUninstallThread *T;
  
!   W=new StatusWidget(0);
  
!   W->show();
!   T=new PackageUninstallThread(_package, W);
    T->start();
  }
--- 242,252 ----
  void Application::doPackageUninstallation(CBM::Package *_package)
  {
!   // StatusWidget           *W;
    PackageUninstallThread *T;
  
!   // W=new StatusWidget(0);
  
!   // W->show();
!   T=new PackageUninstallThread(_package);
    T->start();
  }

Index: compbenchmarks-ui-qt4.pro
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** compbenchmarks-ui-qt4.pro	21 Aug 2007 19:12:22 -0000	1.6
--- compbenchmarks-ui-qt4.pro	29 Aug 2007 20:34:06 -0000	1.7
***************
*** 25,29 ****
  plan_sources	= Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager
  
! all_sources	= $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status main
  
  defineReplace(headers) {
--- 25,29 ----
  plan_sources	= Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager
  
! all_sources	= $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status-UI Status/Status main
  
  defineReplace(headers) {

[Compbench-devel] CompBenchmarks++/CBM-PI Makefile.am,1.22,1.23

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24869

Modified Files:
	Makefile.am 
Log Message:
Fix on C++ wrapper files generation.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.am	29 Aug 2007 15:54:17 -0000	1.22
--- Makefile.am	29 Aug 2007 20:32:48 -0000	1.23
***************
*** 10,14 ****
  lib_LTLIBRARIES		= libCBM.la
  
! libCBM_la_SOURCES	=	Glue.cpp Glue.h # $(top_builddir)/CBM-PI/CBM_wrap.cxx
  
  libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la
--- 10,14 ----
  lib_LTLIBRARIES		= libCBM.la
  
! libCBM_la_SOURCES	=	Glue.cpp Glue.h $(top_builddir)/CBM-PI/CBM_wrap.cxx
  
  libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la
***************
*** 39,48 ****
  EXTRA_DIST	=	CBM.i
  
! inst_pkgdata_DATA	=	CBM.so $(top_srcdir)/CBM-PI/CBM.pm
  
  inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl
  
  $(top_builddir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H)
! 	$(SWIG) -c++ $(INCLUDES) -Wall -proxy -shadow -perl $<
  
  $(top_builddir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H)
--- 39,48 ----
  EXTRA_DIST	=	CBM.i
  
! inst_pkgdata_DATA	=	CBM.so $(top_builddir)/CBM-PI/CBM.pm
  
  inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl
  
  $(top_builddir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H)
! 	$(SWIG) -c++ $(INCLUDES) -Wall -proxy -shadow -perl $< 
  
  $(top_builddir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H)
***************
*** 65,70 ****
  	if test ! -e CBM.so; then ln -sf .libs/libCBM.so CBM.so; fi
  
! all-local: CBM.so
  
  clean-local:
! 	cd $(top_srcdir)/CBM-PI && rm -rf *.pm *.i~ *.cxx *.so *.o *.cpp~ *.h~ Makefile~
\ No newline at end of file
--- 65,70 ----
  	if test ! -e CBM.so; then ln -sf .libs/libCBM.so CBM.so; fi
  
! all-local: $(top_builddir)/CBM-PI/CBM_wrap.cxx $(top_builddir)/CBM-PI/CBM.pm CBM.so
  
  clean-local:
! 	rm CBM.so; cd $(top_srcdir)/CBM-PI && rm -rf *.pm *.i~ *.cxx *.so *.o *.cpp~ *.h~ Makefile~
\ No newline at end of file

[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Makefile.am, 1.4, 1.5

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

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

Modified Files:
	Makefile.am 
Log Message:
Fix #141702 : Correcly compile each benchmark support source (without the need of running make twice).
Obsolete rule removed.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	22 Jan 2007 18:07:12 -0000	1.4
--- Makefile.am	29 Aug 2007 19:34:46 -0000	1.5
***************
*** 25,47 ****
  
  Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h
! libcompbenchmarks_bm_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h
  
  Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h
! libcompbenchmarks_bm_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h
  
  Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h
! libcompbenchmarks_bm_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h
  
  Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h
! libcompbenchmarks_bm_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h
  
  Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h
! libcompbenchmarks_bm_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h
  
  Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h
! libcompbenchmarks_bm_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h
  
  Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h
! libcompbenchmarks_bm_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h
  
  INCLUDES				=	-I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
--- 25,47 ----
  
  Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h
! libcompbenchmarks_bm_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h
  
  Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h
! libcompbenchmarks_bm_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h
  
  Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h
! libcompbenchmarks_bm_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h
  
  Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h
! libcompbenchmarks_bm_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h
  
  Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h
! libcompbenchmarks_bm_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
  
  Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h
! libcompbenchmarks_bm_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h
  
  Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h
! libcompbenchmarks_bm_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h
  
  INCLUDES				=	-I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
***************
*** 52,71 ****
  EXTRA_DIST				=	benchmarks-genlibwrapper.pl benchmarks.list
  
- %.libwraXpper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
- 	echo ">>>>>>>>>>>>>>>> $@"
- 	@(doit=0; echo -n "Checking $@ : "; if test ! -f $(top_srcdir)/SupportedBenchmarks/$@; then \
- 	doit=1; \
- 	fi; \
- 	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@.tmp; \
- 	if test $$doit = "1"; then \
- 	mv $@.tmp $@ && echo "created."; \
- 	else \
- 	diff $@.tmp $@ > /dev/null; \
- 	if test ! $$? == 0; then mv $@.tmp $@ && echo "updated."; else \
- 	echo "up-to-date."; \
- 	fi; \
- 	fi; \
- 	rm $@.tmp 2> /dev/null; exit 0)
- 
  $(top_srcdir)/SupportedBenchmarks/%.libwrapper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
  	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@
--- 52,55 ----

[Compbench-devel] CompBenchmarks++/CBM-PI Makefile.am,1.21,1.22

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19034

Modified Files:
	Makefile.am 
Log Message:
CBM_wrap.cxx removed from sources : it's probably platform dependent, and prevent CBM.pm generation.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.am	22 Aug 2007 18:31:51 -0000	1.21
--- Makefile.am	29 Aug 2007 15:54:17 -0000	1.22
***************
*** 10,14 ****
  lib_LTLIBRARIES		= libCBM.la
  
! libCBM_la_SOURCES	=	Glue.cpp Glue.h $(top_builddir)/CBM-PI/CBM_wrap.cxx
  
  libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la
--- 10,14 ----
  lib_LTLIBRARIES		= libCBM.la
  
! libCBM_la_SOURCES	=	Glue.cpp Glue.h # $(top_builddir)/CBM-PI/CBM_wrap.cxx
  
  libCBM_la_DEPENDENCIES =      ../libcompbenchmarks/libcompbenchmarks.la

[Compbench-devel] CompBenchmarks++/libcompbenchmarks config.h.in, 1.5, 1.6

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

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

Modified Files:
	config.h.in 
Log Message:
Defines TOP_SRCDIR.

Index: config.h.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.h.in	24 Aug 2007 18:40:37 -0000	1.5
--- config.h.in	28 Aug 2007 19:51:13 -0000	1.6
***************
*** 148,151 ****
--- 148,154 ----
  #undef STDC_HEADERS
  
+ /* Sources prefix */
+ #undef TOP_SRCDIR
+ 
  /* Version number of package */
  #undef VERSION

[Compbench-devel] CompBenchmarks++/libcompbenchmarks/System System.cpp, 1.22, 1.23

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

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

Modified Files:
	System.cpp 
Log Message:
Use TOP_SRCDIR to get base directory for KB.

Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** System.cpp	27 Aug 2007 20:28:49 -0000	1.22
--- System.cpp	28 Aug 2007 19:50:47 -0000	1.23
***************
*** 60,63 ****
--- 60,67 ----
    tmp_des+="/share/KB";
    CBM::descriptionIncludePathAdd(tmp_des);
+ 
+   tmp_des=TOP_SRCDIR;
+   tmp_des+="/libcompbenchmarks/share/KB";
+   CBM::descriptionIncludePathAdd(tmp_des);
    CBM::descriptionIncludePathAdd("./libcompbenchmarks/share/KB");
    CBM::descriptionIncludePathAdd("../libcompbenchmarks/share/KB");