compbench-devel Mailing List for CompBenchmarks (Page 10)
Brought to you by:
xfred
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(48) |
Oct
(51) |
Nov
(66) |
Dec
(83) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(242) |
Feb
(56) |
Mar
(95) |
Apr
(120) |
May
(127) |
Jun
(32) |
Jul
(10) |
Aug
(55) |
Sep
(114) |
Oct
(3) |
Nov
|
Dec
|
From: Frederic T. <xf...@us...> - 2007-05-28 17:49:50
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9908 Added Files: cloptions.cpp cloptions.h main.cpp main.h Makefile.am Log Message: First import. --- NEW FILE: cloptions.cpp --- /* ---------------------------------------------------------------------------- $Id: cloptions.cpp,v 1.1 2007/05/28 17:49:46 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <compbenchmarks-plan/cloptions.h> #include <Base/Config.h> #include <Plan/Plan.h> #include <UI/UI.h> #include <config.h> #include <iostream> #include <string> #include <unistd.h> #include <getopt.h> #include <stdio.h> using namespace CBM; typedef enum { ActionUndef, ActionRegisterPlan, ActionUnregisterPlan } OptAction; typedef struct { unsigned int defaultPlan:1; } OptFilter; extern int optind, opterr, optopt; int parseExitValue = -1; void cbmOptionsHelp(void) { std::cout << "Usage: compbenchmarks-core [OPTIONS]" << std::endl << "Plan management :" << std::endl << " --plan-register <file> [--default] : Create file[.xml] plan." << std::endl << " --plan-unregister <file> : Remove a plan." << std::endl << std::endl; } void appendXML(std::string& file) { unsigned int s = file.length(); if (s>=4) { if (file.find(".xml", 0)!=s-4) { file+=".xml"; } } else { file+=".xml"; } } int cbmPlanOptionsParse(int argc, char *argv[]) { int c; OptAction action = ActionUndef; /* (install/uninstall/fetch, etc.) */ OptFilter filter = { 0 }; /* <empty>/all/installed */ int not_done = 1; std::string planFileName; CBM::Plan *P; static const struct option long_options[] = { {"help", no_argument, 0, 'h' }, {"plan-register", required_argument, 0, 'r'}, {"plan-unregister", required_argument, 0, 'u'}, {"default", no_argument, 0, 1003}, {"version", no_argument, 0, 'v'}, { 0, 0, 0, 0} }; while (not_done) { int option_index = 0; if (parseExitValue!=-1) break; c = getopt_long (argc, argv, "hr:u::", long_options, &option_index); if (c==-1) { break; } switch (c) { case 'v': break; case 'h': break; case 'r': action=ActionRegisterPlan; planFileName=optarg; appendXML(planFileName); break; case 'u': action=ActionUnregisterPlan; planFileName=optarg; appendXML(planFileName); break; case 1003: filter.defaultPlan=1; if ((action!=ActionRegisterPlan) && (planFileName=="")) { planFileName=cbmSystem->Config()->getDefaultPlan(); } break; default: case '?': break; } } switch(action) { case ActionRegisterPlan: if (cbmSystem->fileExists(planFileName)) { std::cerr << "File " << planFileName << " exists." << std::endl << "Choose another name or use --unregister to remove this plan." << std::endl; break; } P = new CBM::Plan; parseExitValue=!(P->store(planFileName)); if (filter.defaultPlan) { cbmSystem->Config()->setDefaultPlan(planFileName); cbmSystem->storeConfiguration(); } if (!parseExitValue) { std::cout << planFileName << " created"; if (filter.defaultPlan) { std::cout << " (default plan)"; } std::cout << "." << std::endl; } delete(P); break; case ActionUnregisterPlan: if (filter.defaultPlan) { std::cerr << "--default not supported with this option." << std::endl; break; } P=new CBM::Plan; if (P->restore(planFileName)) { parseExitValue=!(cbmSystem->unlink(planFileName)); if (!parseExitValue) { if (cbmSystem->Config()->getDefaultPlan()!="") { std::string abs = cbmSystem->Config()->Path(CBM::System::CurrentWD); abs+="/"; abs+=planFileName; if (abs==cbmSystem->Config()->getDefaultPlan()) { cbmSystem->Config()->setDefaultPlan(""); cbmSystem->storeConfiguration(); std::cout << planFileName << " removed, and is not default plan anymore." << std::endl; } } else { std::cout << planFileName << " removed." << std::endl; } } } else { std::cerr << "Plan file not detected." << std::endl; } delete(P); break; default: printf("?\n"); break; } cbmSystem->done(); exit(parseExitValue); } --- NEW FILE: main.cpp --- /* ---------------------------------------------------------------------------- $Id: main.cpp,v 1.1 2007/05/28 17:49:46 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <config.h> #include <libcompbenchmarks.h> #include <compbenchmarks-plan/cloptions.h> int main(int argc, char *argv[]) { CBM_SYSTEM sys; int r; sys.init(); r=cbmPlanOptionsParse(argc, argv); sys.done(); return(r); } --- NEW FILE: Makefile.am --- # ----------------------------------------------------------------------------- # $Id: Makefile.am,v 1.1 2007/05/28 17:49:46 xfred Exp $ # # This is free software. # For details, see the GNU Public License in the COPYING file, or # Look http://www.fsf.org # ----------------------------------------------------------------------------- bin_PROGRAMS = compbenchmarks-plan compbenchmarks_plan_SOURCES = cloptions.cpp main.cpp libcompbenchmarksincludedir = $(includedir)/compbenchmarks compbenchmarks_plan_LDADD = ../libcompbenchmarks/libcompbenchmarks.la compbenchmarks_plan_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la noinst_HEADERS = $(compbenchmarks_plan_SOURCES:.cpp=.h) # EXTRA_DIST = compbenchmarks-core.pod compbenchmarks-core.1 INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) # man_MANS = compbenchmarks-core.1 #compbenchmarks-core.1: compbenchmarks-core.pod # pod2man $< > $@ --- NEW FILE: cloptions.h --- /* ---------------------------------------------------------------------------- $Id: cloptions.h,v 1.1 2007/05/28 17:49:46 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBMPLANCLOPTIONS #define H_CBMPLANCLOPTIONS 1 #include <libcompbenchmarks.h> /** Parse command line arguments. High-level function to parse arguments through getopt.h. */ int cbmPlanOptionsParse(int argc, char *argv[]); #endif --- NEW FILE: main.h --- /* ---------------------------------------------------------------------------- $Id: main.h,v 1.1 2007/05/28 17:49:46 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBMPLANMAIN #define H_CBMPLANMAIN #endif |
From: Frederic T. <xf...@us...> - 2007-05-28 17:49:15
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9874/compbenchmarks-plan Log Message: Directory /cvsroot/compbench/CompBenchmarks++/compbenchmarks-plan added to the repository |
From: Frederic T. <xf...@us...> - 2007-05-27 16:06:43
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18552 Modified Files: 07-compbenchmarks-core.pl Log Message: compbenchmarks-core/ directory added : sources moved. Index: 07-compbenchmarks-core.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/07-compbenchmarks-core.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** 07-compbenchmarks-core.pl 17 Apr 2007 20:11:37 -0000 1.6 --- 07-compbenchmarks-core.pl 27 May 2007 16:06:37 -0000 1.7 *************** *** 60,64 **** foreach $i (keys %incompatible_options) { foreach $item (@{$incompatible_options{$i}}) { ! my $cmd = "../../compbenchmarks-core $i $item"; my $output = `$cmd 2>&1`; my $code = $? >> 8; --- 60,64 ---- foreach $i (keys %incompatible_options) { foreach $item (@{$incompatible_options{$i}}) { ! my $cmd = "../../compbenchmarks-core/compbenchmarks-core $i $item"; my $output = `$cmd 2>&1`; my $code = $? >> 8; *************** *** 70,74 **** foreach $item (@valid_options) { my ($option, $xcode, $xoutput) = @{$item}; ! my $cmd = "../../compbenchmarks-core $option"; my $output = `$cmd 2>&1`; my $code = $? >> 8; --- 70,74 ---- foreach $item (@valid_options) { my ($option, $xcode, $xoutput) = @{$item}; ! my $cmd = "../../compbenchmarks-core/compbenchmarks-core $option"; my $output = `$cmd 2>&1`; my $code = $? >> 8; |
From: Frederic T. <xf...@us...> - 2007-05-27 16:06:27
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18527 Added Files: Makefile.am cloptions.cpp cloptions.h compbenchmarks-core.pod main.cpp main.h Log Message: compbenchmarks-core/ directory added : sources moved. --- NEW FILE: cloptions.cpp --- /* ---------------------------------------------------------------------------- $Id: cloptions.cpp,v 1.1 2007/05/27 16:06:19 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <compbenchmarks-core/cloptions.h> #include <Benchmark/Package.h> #include <Benchmark/Benchmark.h> #include <Compiler/Compiler.h> #include <Compiler/Compiler-Option-Description.h> #include <System/System.h> #include <UI/UI.h> #include <config.h> #include <iostream> #include <string> #include <unistd.h> #include <getopt.h> #include <stdio.h> using namespace CBM; typedef enum { DomainUndef, DomainHelp, DomainQuery, DomainVersion, DomainManage, DomainLowLevel, DomainBench } OptDomain; typedef struct { unsigned int all:1; unsigned int installed:1; unsigned int package:1; unsigned int benchmark:1; unsigned int host:1; unsigned int compiler:1; unsigned int external_programs:1; unsigned int option_analyze:1; } OptFilter; typedef enum { ActionUndef, ActionInstall, ActionUninstall, ActionLLDownload, ActionLLExtract, ActionLLPatch, ActionLLPreconfigure, ActionLLRelease, ActionLLTestsuite, ActionLLFetch } OptAction; extern int optind, opterr, optopt; int parseExitValue = -1; void cbmOptionsHelp(void) { std::cout << "Usage: compbenchmarks-core <DOMAIN> [OPTIONS]" << std::endl << "Simple options (no domain):" << std::endl << " --help | -h : this help" << std::endl << " --version | -v : display software version" << std::endl << std::endl << "Query options (with -q or --query domain) :" << std::endl << " --all | -a : display all items" << std::endl << " --installed | -i : display only installed items" << std::endl << " --package | -p : display package(s)" << std::endl << " --benchmark | -b : display benchmark(s)" << std::endl << " --compiler | -c : display informations about compiler" << std::endl << " --host | -H : display informations about host" << std::endl << " --programs | -x : display informations about" << std::endl << " external programs used" << std::endl << std::endl << "Management options (with -m or --manage domain) :" << std::endl << " --install | -I : install package" << std::endl << " --uninstall | -U : uninstall package" << std::endl << std::endl << "Low-level management options (with -M or --low-level domain) :" << std::endl << " --package-download | -D : download package" << std::endl << " --package-fetch | -F : fetch package from a local file" << std::endl << " --package-extract | -E : extract package" << std::endl << " --package-patch | -P : patch package" << std::endl << " --package-preconfigure | -C : pre-configure package" << std::endl << " --package-test | -T : run package's testsuite" << std::endl << " --package-release | -R : clean compiled object" << std::endl << std::endl << "Benchmarking options (with -b or --bench domain) : " << std::endl << " [-b|--bench] <BID> <C> [O] : use compiler C with optional arguments" << std::endl << " O to build benchmark BID" << std::endl << " --disable-testsuite | -S : disable package's test suite" << std::endl << std::endl << "Other options that may affect behaviour :" << std::endl << " --force : force operation" << std::endl << std::endl; } void cbmSingleDomain(OptDomain *domain, OptDomain value, std::string opt) { std::string str; if (*domain!=DomainUndef) { str="Unexpected option : "; str+=opt; CBM::cbmUI->Fatal(str); } else { *domain=value; } } void cbmUnknownBenchmark(char *bench) { int i; int n = cbmSystem->packageNumber(); int j; int m; CBM::Package *P; std::cerr << "Unknow benchmark '" << bench << "'. Valid entries are :" << std::endl; for(i=0; i<n; i++) { P=cbmSystem->Package(i); m=P->benchmarkNumber(); for(j=0;j<m;j++) { std::cerr << " * " << P->Benchmark(j)->Name() << std::endl; } } } void cbmUnknownPackage(char *pack) { std::cerr << "Unknow package '" << pack << "'. Valid entries are :" << std::endl; int i; int n = cbmSystem->packageNumber(); CBM::Package *P; for(i=0; i<n; i++) { P=cbmSystem->Package(i); std::cerr << " * " << P->Name() << std::endl; } } CBM::Benchmark *cbmOptionsExpectBenchmark(char *optarg) { CBM::Benchmark *B = 0; std::string bench; if (!optarg) { std::cerr << "benchmark missing in argument line" << std::endl; parseExitValue=1; return(0); } bench=optarg; B=cbmSystem->Benchmark(bench); if (!B) { cbmUnknownBenchmark((char*) bench.c_str()); parseExitValue=1; return(0); } return(B); } std::string cbmCompilerAnalyze(std::string _analyzeResult) { int i = 0; std::string o = "!"; std::string r; int times = 0; int ok = 0; while (o!="") { o=cbmSystem->Split(_analyzeResult, "\n", i++); if (o=="") { if ((!times) && (_analyzeResult!="")) o=_analyzeResult; else break; } times++; if (o=="1") ok++; else { r+=" * "; r+=o; r+="\n"; } } if (ok==times) return(" * Ok"); else return(r); } CBM::Package *cbmOptionsExpectPackage(char *optarg) { CBM::Package *P = 0; std::string pack; if (!optarg) { std::cerr << "package missing in argument line" << std::endl; parseExitValue=1; return(0); } pack=optarg; P=cbmSystem->Package(pack); if (!P) { cbmUnknownPackage((char*) pack.c_str()); parseExitValue=1; return(0); } return(P); } void cbmShowOptionDescriptions(CBM::Compiler *C) { CBM::CompilerOptionDescriptions *DES = C->OptionDescriptions(); int i; int n = DES->DescriptionNumber(); CBM::CompilerOptionDescription *D; for(i=0; i<n; i++) { D=DES->Description(i); std::cout << "Option ID : " << D->Id() << std::endl << " Description : " << D->ShortDescription() << std::endl << std::endl << " " << D->EditorDescription() << std::endl << std::endl; } } int cbmOptionsParse(int argc, char *argv[]) { int c; int context; CBM::Package::Status status; CBM::Package *P = 0; CBM::Benchmark *B = 0; CBM::CompilerSelector SC(cbmSystem); CBM::Compiler *C = 0; CBM::CompilerOptions *O; std::string bench; std::string compiler; std::string options; std::string tarball; std::string options_analyzed; std::string tmp; OptDomain domain = DomainUndef; /* help/query/{install/uninstall : manage ?}/bench/version/low-level */ OptAction action = ActionUndef; /* (install/uninstall/fetch, etc.) */ OptFilter filter = { 0 }; /* <empty>/all/installed */ std::string object_t; /* package/benchmark/host/compiler */ int not_done = 1; static const struct option long_options[] = { {"help", no_argument, 0, 'h' }, {"query", no_argument, 0, 'q' }, {"version", no_argument, 0, 'v'}, {"manage", no_argument, 0, 'm'}, {"low-level", no_argument, 0, 'M'}, {"bench", required_argument, 0, 'B'}, {"install", required_argument, 0, 'I' }, {"uninstall", required_argument, 0, 'U' }, {"all", 0, 0, 'a' }, {"installed", no_argument, 0, 'i'}, {"package", optional_argument, 0, 'p' }, {"options-analyze", required_argument, 0, 'A'}, {"benchmark", optional_argument, 0, 'b' }, {"host", 0, 0, 'H' }, {"programs", no_argument, 0, 'P' }, {"compiler", required_argument, 0, 'c' }, {"bench", 1, 0, 'B'}, {"package-download", 1, 0, 'D' }, {"package-extract", 1, 0, 'E' }, {"package-patch", 1, 0, 'P' }, {"package-preconfigure", 1, 0, 'C' }, {"package-test", 1, 0, 'T' }, {"package-fetch", 1, 0, 'F' }, {"package-release", 1, 0, 'R' }, {"disable-testsuite", 0, 0, 'S' }, {"force", 0, 0, 'f' }, { 0, 0, 0, 0} }; while (not_done) { int option_index = 0; if (parseExitValue!=-1) break; c = getopt_long (argc, argv, "hvxiI:F:U:qHc:p::B:b::A:aMmD:E:P:C:T:R:S:f", // uLHPCFIB", /* :011000112", */ long_options, &option_index); if (c==-1) { break; } switch (c) { case 'v': cbmSingleDomain(&domain, DomainVersion, "v"); break; case 'q': cbmSingleDomain(&domain, DomainQuery, "q"); break; case 'h': cbmSingleDomain(&domain, DomainHelp, "h"); break; case 'm': cbmSingleDomain(&domain, DomainManage, "m"); break; case 'M': cbmSingleDomain(&domain, DomainLowLevel, "M"); break; case 'a': filter.all=1; break; case 'i': filter.installed=1; break; case 'p': filter.package=1; if (optarg) P=cbmOptionsExpectPackage(optarg); break; case 'b': filter.benchmark=1; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; case 'A': filter.option_analyze=1; if (optarg) options_analyzed=optarg; break; case 'D': action=ActionLLDownload; if (optarg) P=cbmOptionsExpectPackage(optarg); break; case 'E': action=ActionLLExtract; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; case 'P': action=ActionLLPatch; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; case 'C': action=ActionLLPreconfigure; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; case 'T': action=ActionLLTestsuite; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; case 'F': action=ActionLLFetch; P=cbmOptionsExpectPackage(optarg); if (!P) break; optind++; if (optind<=argc) { tarball=argv[optind-1]; } else { std::cerr << "tarball missing in argument line" << std::endl; parseExitValue=1; break; } break; case 'R': action=ActionLLRelease; if (optarg) B=cbmOptionsExpectBenchmark(optarg); break; case 'I': action=ActionInstall; P=cbmOptionsExpectPackage(optarg); break; case 'U': action=ActionUninstall; P=cbmOptionsExpectPackage(optarg); break; case 'S': UO_enableTestSuite=0; break; case 'f': UO_force=1; break; case 'H': filter.host=1; parseExitValue=0; break; case 'x': filter.external_programs=1; parseExitValue=0; break; case 'c': filter.compiler=1; if (optarg) C=SC.select((char*) optarg); break; /* case 'f': !!! P=cbmOptionsExpectPackage(optarg); if (!P) break; if (optind<=argc) { P->Fetch(argv[optind-1], UO_force); } else { std::cerr << "tarball missing in argument line" << std::endl; parseExitValue=1; break; } break; */ case 1011: P=cbmOptionsExpectPackage(optarg); if (P) parseExitValue=!P->Patch(UO_force); break; case 'g': P=cbmOptionsExpectPackage(optarg); if (P) parseExitValue=!P->PreConfigure(UO_force); break; case 't': P=cbmOptionsExpectPackage(optarg); if (P) { if (!UO_enableTestSuite) { CBM::cbmUI->Fatal("Incompatible options : --test and --disable-testsuite"); } } if (P) parseExitValue=!P->Test(UO_force); break; case 'r': P=cbmOptionsExpectPackage(optarg); if (P) parseExitValue=!P->Release(); break; case 'B': domain=DomainBench; B=cbmOptionsExpectBenchmark(optarg); if (!B) break; optind++; if (optind<=argc) { compiler=argv[optind-1]; } else { std::cerr << "compiler missing in argument line" << std::endl; parseExitValue=1; break; } optind++; if (optind<=argc) { options=argv[optind-1]; } else { options=""; } not_done=0; break; case '?': break; } } switch(domain) { case DomainVersion: if ((!filter.all) && (!filter.installed) && (!filter.benchmark) && (!filter.external_programs) && (!filter.host) && (!filter.package) && (!filter.external_programs) && (!filter.compiler) && (action==ActionUndef)) { std::cout << VERSION << std::endl; parseExitValue=0; } else { std::cerr << "Invalid filter or action with -v" << std::endl; parseExitValue=255; } break; case DomainUndef: std::cerr << "Domain not defined." << std::endl; parseExitValue=255; break; case DomainHelp: cbmOptionsHelp(); parseExitValue=0; break; case DomainQuery: if ((!filter.benchmark) && (!filter.package) && (!filter.host) && (!filter.external_programs) && (!filter.compiler)) { std::cerr << "-q expects either -b, -p, -c, -h, or -x option." << std::endl; parseExitValue=255; break; } if (!filter.installed) { if ((!filter.all) && (filter.host)) { std::cout << "Architecture : " << cbmSystem->arch() << std::endl << "Host ID : " << cbmSystem->hostid() << std::endl << "Hostname : " << cbmSystem->hostname() << std::endl << "OS : " << cbmSystem->os() << std::endl << "OS Version : " << cbmSystem->os_version() << std::endl << "Processor name : " << cbmSystem->processor_name() << std::endl << "Processor speed (MHz) : " << cbmSystem->processor_mhz() << std::endl << "Processor cache (Kb) : " << cbmSystem->processor_cache() << std::endl << "Processor number : " << cbmSystem->processor_number() << std::endl; parseExitValue=0; break; } if (filter.compiler) { if (!C) { std::cerr << "Invalid compiler given" << std::endl; parseExitValue=255; break; } std::cout << "Compiler name : " << C->Name() << std::endl << "Version : " << C->Version() << std::endl << "Language : " << C->Language() << std::endl << "Binary : " << C->Binary() << std::endl; if ((!filter.option_analyze) && (filter.all)) { cbmShowOptionDescriptions(C); } if (filter.option_analyze) { std::cout << std::endl << "Descriptions from " << C->compiler() << ", branch " << C->relativeDescriptionDirectory() << std::endl << "Option(s) analyzed : " << options_analyzed << std::endl; if (filter.all) { std::cout << std::endl << "Option short descriptions :" << std::endl; std::cout << C->shortHelpOptions(options_analyzed) << std::endl; } else std::cout << std::endl; std::cout << "Analyze : " << std::endl; tmp=cbmCompilerAnalyze(C->analyzeOptions(options_analyzed)); std::cout << tmp << std::endl; } parseExitValue=0; break; } if (filter.external_programs) { std::cout << "BZIP2:" << CBM_PROG_BZIP2 << std::endl << "CUT:" << CBM_PROG_CUT << std::endl << "DD:" << CBM_PROG_DD << std::endl << "DIALOG:" << CBM_PROG_DIALOG << std::endl << "GREP:" << CBM_PROG_GREP << std::endl << "GZIP:" << CBM_PROG_GZIP << std::endl << "HEAD:" << CBM_PROG_HEAD << std::endl << "MAKE:" << CBM_PROG_MAKE << std::endl << "MKDIR:" << CBM_PROG_MKDIR << std::endl << "PATCH:" << CBM_PROG_PATCH << std::endl << "RM:" << CBM_PROG_RM << std::endl << "TAIL:" << CBM_PROG_TAIL << std::endl << "TAR:" << CBM_PROG_TAR << std::endl << "UNZIP:" << CBM_PROG_UNZIP << std::endl << "WGET:" << CBM_PROG_WGET << std::endl << "ZCAT:" << CBM_PROG_ZCAT << std::endl << "CAT:" << CBM_PROG_CAT << std::endl << "PERL:" << CBM_PROG_PERL << std::endl; parseExitValue=0; break; } } if ((filter.all) || (filter.installed)) { if (filter.host) { std::cerr << "-H option incompatible in that query." << std::endl; parseExitValue=255; break; } if ((filter.package) && (P)) { std::cerr << "-p must have no argument when -a or -i is used." << std::endl; parseExitValue=255; break; } if ((filter.benchmark) && (B)) { std::cerr << "-b must have no argument when -a or -i is used." << std::endl; parseExitValue=255; break; } } if ((filter.package) && (filter.benchmark)) { if ((!filter.all) && (!filter.installed) && (P)) { int i; int n = P->benchmarkNumber(); for(i=0; i<n; i++) { B=P->Benchmark(i); std::cout << B->Name() << std::endl; } parseExitValue=0; } break; } if (filter.package) { if ((filter.all) && (!filter.installed)) { int i; int n = cbmSystem->packageNumber(); for(i=0; i<n; i++) { P=cbmSystem->Package(i); std::cout << P->Name() << " " << P->Version() << std::endl; } parseExitValue=0; } if ((!filter.all) && (filter.installed)) { int i; int n = cbmSystem->packageNumber(); for(i=0; i<n; i++) { P=cbmSystem->Package(i); if (P->getStatus()>=CBM::Package::Preconfigured) { std::cout << P->Name() << " " << P->Version() << std::endl; } } parseExitValue=0; } if ((!filter.all) && (!filter.installed)) { if (P) { std::cout << "Package (PID) : " << P->Name() << std::endl; std::cout << "Version : " << P->Version() << std::endl; std::cout << "Size : " << P->Size() << std::endl; std::cout << "Total size : " << P->totalSize() << std::endl; std::cout << "Benchmarks : " << P->benchmarkNumber() << std::endl; std::cout << "Language : " << P->language() << std::endl; std::cout << "License : " << P->license() << std::endl; std::cout << "Author : " << P->author() << std::endl; std::cout << "Homepage : " << P->homePage() << std::endl; std::cout << "Download URL : " << P->downloadURL() << std::endl; std::cout << "Testsuite : " << (P->hasTest() ? "Yes" : "No") << std::endl; std::cout << "Status : " << P->getStatusStr() << std::endl; std::cout << "Comments : " << std::endl; std::cout << P->Comments() << std::endl; parseExitValue=0; } else { std::cerr << "No package found. Try compbenchmarks-core -q -p<package>\n"; parseExitValue=255; } } } else if (filter.benchmark) { if ((filter.all) && (!filter.installed)) { int i; int n = cbmSystem->packageNumber(); int j; int m; for(i=0; i<n; i++) { P=cbmSystem->Package(i); m=P->benchmarkNumber(); for(j=0; j<m; j++) { B=P->Benchmark(j); std::cout << B->Name() << std::endl; } } parseExitValue=0; } if ((!filter.all) && (filter.installed)) { int i; int n = cbmSystem->packageNumber(); int j; int m; for(i=0; i<n; i++) { P=cbmSystem->Package(i); if (P->getStatus()>=CBM::Package::Preconfigured) { m=P->benchmarkNumber(); for(j=0; j<m; j++) { B=P->Benchmark(j); std::cout << B->Name() << std::endl; } } } parseExitValue=0; } if ((!filter.all) && (!filter.installed) && (B)) { std::cout << "Benchmark (PID) : " << B->Name() << std::endl; std::cout << "Package (PID) : " << B->Package()->Name() << std::endl; std::cout << "Comments : " << std::endl; std::cout << B->Comments() << std::endl; parseExitValue=0; } } break; case DomainManage: switch(action) { case ActionInstall: if (P) parseExitValue=!P->Install(UO_force); break; case ActionUninstall: if (P) { parseExitValue=!P->Uninstall(); if (parseExitValue) { std::cerr << "Can't uninstall package." << std::endl; } } break; default: case ActionUndef: std::cerr << "action not specified." << std::endl; std::cerr << "Valid options are -I and -U." << std::endl; parseExitValue=255; break; } break; case DomainLowLevel: if (filter.host) { std::cerr << "-H and -M options not compatibles." << std::endl; parseExitValue=1; break; } switch(action) { case ActionLLDownload: if (P->downloadURL()!="") { parseExitValue=!P->Download(); } else { std::cerr << "Package is not known to be hosted anymore on the Internet. Use --fetch <tarball> option" << std::endl; parseExitValue=1; } break; case ActionInstall: case ActionUninstall: std::cerr << "Incompatible option for action. You probably meant -m." << std::endl; break; case ActionLLFetch: P->Fetch((char*) tarball.c_str(), UO_force); break; case ActionLLExtract: parseExitValue=!P->Extract(); break; case ActionLLPatch: parseExitValue=!P->Patch(); break; case ActionLLPreconfigure: parseExitValue=!P->PreConfigure(); break; case ActionLLRelease: parseExitValue=!P->Release(); break; case ActionLLTestsuite: parseExitValue=!P->Test(); break; default: std::cerr << "Invalid or missing option for -M" << std::endl; parseExitValue=255; break; } break; case DomainBench: if (!B) { std::cerr << "benchmark (BID) expected" << std::endl; break; } C=SC.select((char*) compiler.c_str()); if (!C) { std::cerr << "Compiler " << compiler.c_str() << " not found." << std::endl; parseExitValue=1; break; } O=new CBM::CompilerOptions(options); P=B->Package(); if (P->getStatus()<CBM::Package::Preconfigured) { std::cerr << "Package not properly installed" << std::endl; parseExitValue=1; break; } context=P->ContextMatches(C, O); status=P->getStatus(); if ((status>=CBM::Package::Configured) && (!context)) { P->Release(); } if (!context) { P->Configure(C, O); P->Make(UO_force); P->Test(UO_force); } B->Bench(); parseExitValue=0; break; } cbmSystem->done(); exit(parseExitValue); } --- NEW FILE: main.cpp --- /* ---------------------------------------------------------------------------- $Id: main.cpp,v 1.1 2007/05/27 16:06:20 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #include <config.h> #include <libcompbenchmarks.h> #include <compbenchmarks-core/cloptions.h> int main(int argc, char *argv[]) { CBM_SYSTEM sys; int r; sys.init(); r=cbmOptionsParse(argc, argv); sys.done(); return(r); } --- NEW FILE: cloptions.h --- /* ---------------------------------------------------------------------------- $Id: cloptions.h,v 1.1 2007/05/27 16:06:19 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBMCLOPTIONS #define H_CBMCLOPTIONS 1 #include <libcompbenchmarks.h> /** Parse command line arguments. High-level function to parse arguments through getopt.h. */ int cbmOptionsParse(int argc, char *argv[]); #endif --- NEW FILE: compbenchmarks-core.pod --- =head1 NAME compbenchmarks-core 0.5.0 - Compilers' benchmarking environment =head1 SYNOPSIS compbenchmarks-core --help Show help. =head1 QUERYING compbenchmarks-core --version Show software version. compbenchmarks-core --install <b-id> Install benchmark <b-id> from the Internet. See --list-benchmarks to get a list of available benchmark's IDs (b-id). compbenchmarks-core --fetch <b-id> <tarball> Install benchmark <b-id> from a local archive. See --list-benchmarks to get a list of available benchmark's IDs (b-id). compbenchmarks-core --uninstall <b-id> Uninstall specified benchmark or package. compbenchmarks-core --list-benchmarks List all recognized benchmarks/packages. compbenchmarks-core --host-infos Show host's informations compbenchmarks-core --program-infos Show informations about all used external programs. compbenchmarks-core --compiler-infos <c-bin> Show informations about specified binary (compiler). <c-bin> may be either a relative compiler (like gcc-3.3) or a full path to the compiler binary (/opt/lt/bin/g++). compbenchmarks-core --benchmark-infos <b-id> Show informations about specified benchmark. compbenchmarks-core --bench <b-id> <c-bin> [c-options] Make benchmark with specified compiler and options (if given), and returns performance (higher is better). Here are some more fine-grained operations : compbenchmarks-core --download <b-id> Download benchmark, and verify checksum. compbenchmarks-core --extract <b-id> Extract given benchmark (from a downloaded archive). compbenchmarks-core --patch <b-id> Patch benchmark (not always needed). compbenchmarks-core --preconfigure <b-id> Preconfigure a benchmark (not always needed). compbenchmarks-core --test <b-id> Test if a benchmark runs as expected (require package's internal test suite). compbenchmarks-core --release <b-id> Clean built object for a benchmark. compbenchmarks-core --force --test <b-id> Force the test suite execution (even if it has already been executed). force may be applied to other options. compbenchmarks-core --disable-testsuite --bench <b-id> <c-bin> [c-options] Disable benchmark's embedded test suite. =head1 DESCRIPTION This tool provides a command line interface to compile and evaluate C/C++ benchmarks according to customizable parameters. Normally user'd prefer compbenchmarks-ui-* binaries. =head1 DIRECTORIES =over =item ~/.compbenchmarks root directory for all related files and directories =item ~/.compbenchmarks/Downloads holds downloaded benchmarks =item ~/.compbenchmarks/$HOSTNAME your host's dedicated space =item ~/.compbenchmarks/$HOSTNAME/Extracts extract and compilation directory for benchmark's archives =item ~/.compbenchmarks/$HOSTNAME/Status holds benchmarks' status =item ~/.compbenchmarks/$HOSTNAME/Configuration configuration file. See below. =back =head1 AUTHOR Frederic Trouche --- NEW FILE: main.h --- /* ---------------------------------------------------------------------------- $Id: main.h,v 1.1 2007/05/27 16:06:22 xfred Exp $ This is free software. For details, see the GNU Public License in the COPYING file, or Look http://www.fsf.org ------------------------------------------------------------------------- */ #ifndef H_CBMMAIN #define H_CBMMAIN /*! \mainpage CompBenchmarks Reference Manual * * \section intro_sec A foreword * * This document presents concepts, source layout and organisation of CompBenchmarks. * As a reminder, this software has been released under the GPL license and aims to * provide a convenient environment to benchmark software using different compilers * and options on a variety of architectures. * * \subsection foreword_programs Programs * * CompBenchmarks is a package built around the libcompbenchmarks shared library, * which brings core functionnalities. It also comes with * compbenchmarks-core, other programs and user interfaces that interracts with * libcompbenchmarks. * * \subsection foreword_moreinfo More informations * * New releases and complementory information can be found at * http://compbench.sourceforge.net . * * \section abstraction General organisation * * CompBenchmarks core relies on a few definitions : * - \link CBM::System operating system\endlink which provides abstraction interface for all supported operating systems, * - \link CBM::Package package\endlink; that's API to declare and handle packages. * - \link CBM::Benchmark benchmark\endlink; which uses packages to describe what are related benchmarks, * - \link CBM::Compiler compilers\endlink and \link CBM::CompilerOptions compilation options\endlink and \link CBM::CompilerOptionDescriptions descriptions\endlink, * - \link CBM::Plan benchmark plan\endlink. It stores and handles current benchmarking context, * - \link CBM::UI user interface\endlink. Higher-level core abstractions for UI. * * Another major element is \ref howto_kb "knowledge-base", which can for instance enlight * incompatibilities between options, and which is used in * \link CBM::Plan benchmark plans\endlink. * * \section behaviour Hacking ? * * Here are few entry points, mainly for contributors : * - \ref howto_kb "XML knowledge base", * - \ref new_compiler_support "Supporting a new compiler", * - \ref improve_compiler_support "Improving or fixing logic for a supported compiler", * - \ref howto_new_package_support "Adding a new package", * - \ref howto_new_benchmark_support "Adding a new benchmark". * */ #endif --- NEW FILE: Makefile.am --- # ----------------------------------------------------------------------------- # $Id: Makefile.am,v 1.1 2007/05/27 16:06:19 xfred Exp $ # # This is free software. # For details, see the GNU Public License in the COPYING file, or # Look http://www.fsf.org # ----------------------------------------------------------------------------- bin_PROGRAMS = compbenchmarks-core compbenchmarks_core_SOURCES = cloptions.cpp main.cpp libcompbenchmarksincludedir = $(includedir)/compbenchmarks compbenchmarks_core_LDADD = ../libcompbenchmarks/libcompbenchmarks.la compbenchmarks_core_DEPENDENCIES = ../libcompbenchmarks/libcompbenchmarks.la noinst_HEADERS = $(compbenchmarks_core_SOURCES:.cpp=.h) EXTRA_DIST = compbenchmarks-core.pod compbenchmarks-core.1 INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) man_MANS = compbenchmarks-core.1 compbenchmarks-core.1: compbenchmarks-core.pod pod2man $< > $@ |
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18157 Modified Files: configure.in Makefile.am Removed Files: cloptions.cpp cloptions.h compbenchmarks-core.1 compbenchmarks-core.pod main.cpp main.h Log Message: compbenchmarks-core/ directory added. --- cloptions.cpp DELETED --- --- main.cpp DELETED --- Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** configure.in 24 May 2007 16:48:25 -0000 1.32 --- configure.in 27 May 2007 16:05:58 -0000 1.33 *************** *** 300,303 **** --- 300,304 ---- CBM-PI/t/Makefile CBM-PI/Makefile + compbenchmarks-core/Makefile Makefile) --- cloptions.h DELETED --- --- compbenchmarks-core.1 DELETED --- --- compbenchmarks-core.pod DELETED --- --- main.h DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.am 24 May 2007 16:36:43 -0000 1.20 --- Makefile.am 27 May 2007 16:05:58 -0000 1.21 *************** *** 8,21 **** ! SUBDIRS = libcompbenchmarks SupportedBenchmarks CBM-PI # Qt-4 ! ! bin_PROGRAMS = compbenchmarks-core ! ! compbenchmarks_core_SOURCES = cloptions.cpp main.cpp ! ! libcompbenchmarksincludedir = $(includedir)/compbenchmarks ! ! compbenchmarks_core_LDADD = libcompbenchmarks/libcompbenchmarks.la ! compbenchmarks_core_DEPENDENCIES = libcompbenchmarks/libcompbenchmarks.la doxygen_headers = howto_kb.h \ --- 8,12 ---- ! SUBDIRS = libcompbenchmarks SupportedBenchmarks CBM-PI compbenchmarks-core doxygen_headers = howto_kb.h \ *************** *** 25,38 **** howto_new_benchmark_support.h ! noinst_HEADERS = cloptions.h main.h $(doxygen_headers) $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!! ! ! EXTRA_DIST = Doxyfile compbenchmarks-core.pod compbenchmarks-core.1 ! ! INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) ! ! man_MANS = compbenchmarks-core.1 ! compbenchmarks-core.1: compbenchmarks-core.pod ! pod2man $< > $@ test: --- 16,22 ---- howto_new_benchmark_support.h ! noinst_HEADERS = $(doxygen_headers) ! EXTRA_DIST = Doxyfile test: |
From: Frederic T. <xf...@us...> - 2007-05-27 16:05:02
|
Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17783/compbenchmarks-core Log Message: Directory /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core added to the repository |
From: Frederic T. <xf...@us...> - 2007-05-27 15:56:17
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14711 Modified Files: 00-CBMSystem-public.pl Log Message: 0.5.0-BETA1 Index: 00-CBMSystem-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** 00-CBMSystem-public.pl 23 May 2007 17:27:24 -0000 1.9 --- 00-CBMSystem-public.pl 27 May 2007 15:56:13 -0000 1.10 *************** *** 165,169 **** test_getLastCommand(); test_getLastCommandOutput(); ! ok($sys->Version() eq "0.5.0-ALPHA1"); $sys->done(); --- 165,169 ---- test_getLastCommand(); test_getLastCommandOutput(); ! ok($sys->Version() eq "0.5.0-BETA1"); $sys->done(); |
From: Frederic T. <xf...@us...> - 2007-05-24 17:56:37
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4868 Modified Files: ChangeLog Log Message: 0.5.0-BETA1 Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ChangeLog 23 May 2007 15:36:42 -0000 1.22 --- ChangeLog 24 May 2007 17:56:33 -0000 1.23 *************** *** 1,2 **** --- 1,7 ---- + 0.5.0-BETA1 + * Removed useless UI script. + * Fix in package's fetch mechanism. + * Minor changes in help. + 0.5.0-ALPHA1 * Testsuite added. |
From: Frederic T. <xf...@us...> - 2007-05-24 16:48:51
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11420 Modified Files: compbenchmarks-core.pod Log Message: Minor changes. Index: compbenchmarks-core.pod =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core.pod,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** compbenchmarks-core.pod 23 May 2007 15:39:34 -0000 1.5 --- compbenchmarks-core.pod 24 May 2007 16:48:48 -0000 1.6 *************** *** 5,38 **** =head1 SYNOPSIS ! QUERYING : ! compbenchmarks [COMMAND] ! Show embedded help. ! compbenchmarks --version Show software version. ! compbenchmarks --install <b-id> Install benchmark <b-id> from the Internet. See --list-benchmarks to get a list of available benchmark's IDs (b-id). ! compbenchmarks --fetch <b-id> <tarball> Install benchmark <b-id> from a local archive. See --list-benchmarks to get a list of available benchmark's IDs (b-id). ! compbenchmarks --uninstall <b-id> Uninstall specified benchmark or package. ! compbenchmarks --list-benchmarks List all recognized benchmarks/packages. ! compbenchmarks --host-infos Show host's informations ! compbenchmarks --program-infos Show informations about all used external programs. ! compbenchmarks --compiler-infos <c-bin> Show informations about specified binary (compiler). <c-bin> may be either a relative compiler --- 5,39 ---- =head1 SYNOPSIS ! compbenchmarks-core --help ! Show help. ! =head1 QUERYING ! ! compbenchmarks-core --version Show software version. ! compbenchmarks-core --install <b-id> Install benchmark <b-id> from the Internet. See --list-benchmarks to get a list of available benchmark's IDs (b-id). ! compbenchmarks-core --fetch <b-id> <tarball> Install benchmark <b-id> from a local archive. See --list-benchmarks to get a list of available benchmark's IDs (b-id). ! compbenchmarks-core --uninstall <b-id> Uninstall specified benchmark or package. ! compbenchmarks-core --list-benchmarks List all recognized benchmarks/packages. ! compbenchmarks-core --host-infos Show host's informations ! compbenchmarks-core --program-infos Show informations about all used external programs. ! compbenchmarks-core --compiler-infos <c-bin> Show informations about specified binary (compiler). <c-bin> may be either a relative compiler *************** *** 40,47 **** (/opt/lt/bin/g++). ! compbenchmarks --benchmark-infos <b-id> Show informations about specified benchmark. ! compbenchmarks --bench <b-id> <c-bin> [c-options] Make benchmark with specified compiler and options (if given), and returns performance (higher is --- 41,48 ---- (/opt/lt/bin/g++). ! compbenchmarks-core --benchmark-infos <b-id> Show informations about specified benchmark. ! compbenchmarks-core --bench <b-id> <c-bin> [c-options] Make benchmark with specified compiler and options (if given), and returns performance (higher is *************** *** 50,78 **** Here are some more fine-grained operations : ! compbenchmarks --download <b-id> Download benchmark, and verify checksum. ! compbenchmarks --extract <b-id> Extract given benchmark (from a downloaded archive). ! compbenchmarks --patch <b-id> Patch benchmark (not always needed). ! compbenchmarks --preconfigure <b-id> Preconfigure a benchmark (not always needed). ! compbenchmarks --test <b-id> Test if a benchmark runs as expected (require package's internal test suite). ! compbenchmarks --release <b-id> Clean built object for a benchmark. ! compbenchmarks --force --test <b-id> Force the test suite execution (even if it has already been executed). force may be applied to other options. ! compbenchmarks --disable-testsuite --bench <b-id> <c-bin> [c-options] Disable benchmark's embedded test suite. --- 51,79 ---- Here are some more fine-grained operations : ! compbenchmarks-core --download <b-id> Download benchmark, and verify checksum. ! compbenchmarks-core --extract <b-id> Extract given benchmark (from a downloaded archive). ! compbenchmarks-core --patch <b-id> Patch benchmark (not always needed). ! compbenchmarks-core --preconfigure <b-id> Preconfigure a benchmark (not always needed). ! compbenchmarks-core --test <b-id> Test if a benchmark runs as expected (require package's internal test suite). ! compbenchmarks-core --release <b-id> Clean built object for a benchmark. ! compbenchmarks-core --force --test <b-id> Force the test suite execution (even if it has already been executed). force may be applied to other options. ! compbenchmarks-core --disable-testsuite --bench <b-id> <c-bin> [c-options] Disable benchmark's embedded test suite. *************** *** 80,92 **** This tool provides a command line interface to ! compile and evaluate C/C++ benchmarks more conveniently, ! according to customizable parameters. ! Normally used by compbenchmarks-ui-perl program. =head1 DIRECTORIES - All but the latest are used by compbenchmarks-ui-perl - =over --- 81,90 ---- This tool provides a command line interface to ! compile and evaluate C/C++ benchmarks according to customizable parameters. ! Normally user'd prefer compbenchmarks-ui-* binaries. =head1 DIRECTORIES =over *************** *** 103,114 **** =item ~/.compbenchmarks/$HOSTNAME/Configuration configuration file. See below. - =item ~/.compbenchmarks/$HOSTNAME/lockfile.pid Lockfile. - =back - =head1 SEE ALSO - - Manpage of compbenchmarks-ui-perl. - =head1 AUTHOR --- 101,106 ---- |
From: Frederic T. <xf...@us...> - 2007-05-24 16:48:37
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11400 Modified Files: configure.in Log Message: 0.5.0-BETA1 Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** configure.in 23 May 2007 17:26:20 -0000 1.31 --- configure.in 24 May 2007 16:48:25 -0000 1.32 *************** *** 15,19 **** AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0-ALPHA1) AM_CONFIG_HEADER(libcompbenchmarks/config.h) --- 15,19 ---- AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0-BETA1) AM_CONFIG_HEADER(libcompbenchmarks/config.h) |
From: Frederic T. <xf...@us...> - 2007-05-24 16:46:24
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10613 Modified Files: cloptions.cpp Log Message: Updates in -h. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** cloptions.cpp 24 May 2007 16:34:50 -0000 1.25 --- cloptions.cpp 24 May 2007 16:46:19 -0000 1.26 *************** *** 55,63 **** void cbmOptionsHelp(void) { ! std::cout << "Usage: compbenchmarks-core <OPTION...>" << std::endl ! << "Simple options :" << std::endl << " --help | -h : this help" << std::endl << " --version | -v : display software version" << std::endl << std::endl ! << "Query options (with -q or --query) :" << std::endl << " --all | -a : display all items" << std::endl << " --installed | -i : display only installed items" << std::endl --- 55,63 ---- void cbmOptionsHelp(void) { ! std::cout << "Usage: compbenchmarks-core <DOMAIN> [OPTIONS]" << std::endl ! << "Simple options (no domain):" << std::endl << " --help | -h : this help" << std::endl << " --version | -v : display software version" << std::endl << std::endl ! << "Query options (with -q or --query domain) :" << std::endl << " --all | -a : display all items" << std::endl << " --installed | -i : display only installed items" << std::endl *************** *** 68,83 **** << " --programs | -x : display informations about" << std::endl << " external programs used" << std::endl << std::endl ! << "Management options (with -m or --manage) :" << std::endl << " --install | -I : install package" << std::endl << " --uninstall | -U : uninstall package" << std::endl << std::endl ! << "Low-level management options (with -M or --low-level) :" << std::endl << " --package-download | -D : download package" << std::endl ! << " --package-fetch | -F : fetch package from a local file" << std::endl ! << " --package-extract | -E : extract package" << std::endl ! << " --package-patch | -P : patch package" << std::endl ! << " --package-preconfigure | -C : pre-configure package" << std::endl ! << " --package-test | -T : run package's testsuite" << std::endl ! << " --package-release | -R : clean compiled object" << std::endl << std::endl ! << "Benchmarking options (with -b or --bench) : " << std::endl << " [-b|--bench] <BID> <C> [O] : use compiler C with optional arguments" << std::endl << " O to build benchmark BID" << std::endl --- 68,83 ---- << " --programs | -x : display informations about" << std::endl << " external programs used" << std::endl << std::endl ! << "Management options (with -m or --manage domain) :" << std::endl << " --install | -I : install package" << std::endl << " --uninstall | -U : uninstall package" << std::endl << std::endl ! << "Low-level management options (with -M or --low-level domain) :" << std::endl << " --package-download | -D : download package" << std::endl ! << " --package-fetch | -F : fetch package from a local file" << std::endl ! << " --package-extract | -E : extract package" << std::endl ! << " --package-patch | -P : patch package" << std::endl ! << " --package-preconfigure | -C : pre-configure package" << std::endl ! << " --package-test | -T : run package's testsuite" << std::endl ! << " --package-release | -R : clean compiled object" << std::endl << std::endl ! << "Benchmarking options (with -b or --bench domain) : " << std::endl << " [-b|--bench] <BID> <C> [O] : use compiler C with optional arguments" << std::endl << " O to build benchmark BID" << std::endl *************** *** 486,490 **** break; case DomainUndef: ! std::cerr << "domain not defined." << std::endl; parseExitValue=255; break; --- 486,490 ---- break; case DomainUndef: ! std::cerr << "Domain not defined." << std::endl; parseExitValue=255; break; |
From: Frederic T. <xf...@us...> - 2007-05-24 16:37:17
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7141 Removed Files: compbenchmarks-ui.pl Log Message: Obsoleted. --- compbenchmarks-ui.pl DELETED --- |
From: Frederic T. <xf...@us...> - 2007-05-24 16:36:46
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6763 Modified Files: Makefile.am Removed Files: compbenchmarks-ui-perl compbenchmarks-ui-perl.1 Log Message: Perl UI obsoleted. --- compbenchmarks-ui-perl.1 DELETED --- Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.am 23 May 2007 15:37:59 -0000 1.19 --- Makefile.am 24 May 2007 16:36:43 -0000 1.20 *************** *** 27,45 **** noinst_HEADERS = cloptions.h main.h $(doxygen_headers) $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!! ! EXTRA_DIST = compbenchmarks-ui-perl Doxyfile compbenchmarks-ui-perl.1 compbenchmarks-core.pod compbenchmarks-core.1 INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) ! man_MANS = compbenchmarks-ui-perl.1 compbenchmarks-core.1 ! ! compbenchmarks-ui-perl.1: compbenchmarks-ui-perl ! pod2man $< > $@ compbenchmarks-core.1: compbenchmarks-core.pod pod2man $< > $@ - install-exec-hook: - cp compbenchmarks-ui-perl $(DESTDIR)$(bindir) - test: @CBM_PROG_MAKE@ -C CBM-PI test \ No newline at end of file --- 27,39 ---- noinst_HEADERS = cloptions.h main.h $(doxygen_headers) $(libcompbenchmarks_la_SOURCES:.cpp=.h) # !!! ! EXTRA_DIST = Doxyfile compbenchmarks-core.pod compbenchmarks-core.1 INCLUDES = -I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir) ! man_MANS = compbenchmarks-core.1 compbenchmarks-core.1: compbenchmarks-core.pod pod2man $< > $@ test: @CBM_PROG_MAKE@ -C CBM-PI test \ No newline at end of file --- compbenchmarks-ui-perl DELETED --- |
From: Frederic T. <xf...@us...> - 2007-05-24 16:35:03
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5985 Modified Files: cloptions.cpp Log Message: Fix in Fetch mode. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** cloptions.cpp 16 Apr 2007 20:14:53 -0000 1.24 --- cloptions.cpp 24 May 2007 16:34:50 -0000 1.25 *************** *** 361,364 **** --- 361,365 ---- if (!P) break; + optind++; if (optind<=argc) { tarball=argv[optind-1]; *************** *** 628,645 **** parseExitValue=0; } ! if ((!filter.all) && (!filter.installed) && (P)) { ! std::cout << "Package (PID) : " << P->Name() << std::endl; ! std::cout << "Version : " << P->Version() << std::endl; ! std::cout << "Size : " << P->Size() << std::endl; ! std::cout << "Total size : " << P->totalSize() << std::endl; ! std::cout << "Benchmarks : " << P->benchmarkNumber() << std::endl; ! std::cout << "Language : " << P->language() << std::endl; ! std::cout << "License : " << P->license() << std::endl; ! std::cout << "Author : " << P->author() << std::endl; ! std::cout << "Testsuite : " << (P->hasTest() ? "Yes" : "No") << std::endl; ! std::cout << "Status : " << P->getStatusStr() << std::endl; ! std::cout << "Comments : " << std::endl; ! std::cout << P->Comments() << std::endl; ! parseExitValue=0; } --- 629,654 ---- parseExitValue=0; } ! ! if ((!filter.all) && (!filter.installed)) { ! if (P) { ! std::cout << "Package (PID) : " << P->Name() << std::endl; ! std::cout << "Version : " << P->Version() << std::endl; ! std::cout << "Size : " << P->Size() << std::endl; ! std::cout << "Total size : " << P->totalSize() << std::endl; ! std::cout << "Benchmarks : " << P->benchmarkNumber() << std::endl; ! std::cout << "Language : " << P->language() << std::endl; ! std::cout << "License : " << P->license() << std::endl; ! std::cout << "Author : " << P->author() << std::endl; ! std::cout << "Homepage : " << P->homePage() << std::endl; ! std::cout << "Download URL : " << P->downloadURL() << std::endl; ! std::cout << "Testsuite : " << (P->hasTest() ? "Yes" : "No") << std::endl; ! std::cout << "Status : " << P->getStatusStr() << std::endl; ! std::cout << "Comments : " << std::endl; ! std::cout << P->Comments() << std::endl; ! parseExitValue=0; ! } else { ! std::cerr << "No package found. Try compbenchmarks-core -q -p<package>\n"; ! parseExitValue=255; ! } } |
From: Frederic T. <xf...@us...> - 2007-05-24 16:01:20
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25918 Modified Files: Makefile.am Log Message: CXXFLAGS unset (removes compilation errors on some platforms). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.am 23 May 2007 17:27:56 -0000 1.19 --- Makefile.am 24 May 2007 16:01:14 -0000 1.20 *************** *** 51,54 **** --- 51,58 ---- AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` + # Removes all optimisation & warnings flags here (useless and may cause compilation + # errors). + CXXFLAGS = + libCBM_la_LIBADD = ../libcompbenchmarks/libcompbenchmarks.la |
From: Frederic T. <xf...@us...> - 2007-05-23 18:25:04
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26338 Modified Files: UI.cpp UI.h Log Message: Improved API to display benchmark results. Index: UI.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UI.h 17 May 2007 14:33:45 -0000 1.5 --- UI.h 23 May 2007 18:25:00 -0000 1.6 *************** *** 78,81 **** --- 78,85 ---- float _progress = 0); + virtual void InformationBenchmarkResult(std::string _bid, + std::string _xtime, + std::string _r); + /* virtual void ProgressInit(std::string msg); Index: UI.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UI.cpp 17 May 2007 14:33:45 -0000 1.6 --- UI.cpp 23 May 2007 18:25:00 -0000 1.7 *************** *** 170,173 **** --- 170,181 ---- } + void UI::InformationBenchmarkResult(std::string _bid, + std::string _xtime, + std::string _r) + { + std::cout << _bid << " Execution time (s) : " << _xtime << std::endl; + std::cout << _bid << " Measured (higher is better) : " << _r << std::endl; + } + /* void UI::ProgressInit(std::string msg) |
From: Frederic T. <xf...@us...> - 2007-05-23 18:24:07
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25975 Modified Files: Compiler-Options.cpp Log Message: Fix in option handling (for compilation and related context updates). Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Compiler-Options.cpp 17 May 2007 14:31:13 -0000 1.3 --- Compiler-Options.cpp 23 May 2007 18:24:03 -0000 1.4 *************** *** 22,26 **** while (o!="") { o=cbmSystem->Split(_options, " ", i++); ! if (o=="") { add(o); } --- 22,29 ---- while (o!="") { o=cbmSystem->Split(_options, " ", i++); ! if ((o=="") && (i==1)) { ! add(_options); ! } ! if (o!="") { add(o); } |
From: Frederic T. <xf...@us...> - 2007-05-23 18:23:20
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25906 Modified Files: Benchmark.cpp Log Message: Fix in option handling (for compilation and related context updates). Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Benchmark.cpp 17 May 2007 14:29:12 -0000 1.9 --- Benchmark.cpp 23 May 2007 18:23:16 -0000 1.10 *************** *** 85,88 **** --- 85,92 ---- cbmUI->Information(CBM::UI::BenchResult, CBM::UI::OK); + + cbmUI->InformationBenchmarkResult(Name(), + tmp, + r); } else { cbmUI->Information(CBM::UI::BenchResult, |
From: Frederic T. <xf...@us...> - 2007-05-23 17:27:59
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4878 Modified Files: Makefile.am Log Message: Interface source files generated in builddir. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.am 23 May 2007 15:33:24 -0000 1.18 --- Makefile.am 23 May 2007 17:27:56 -0000 1.19 *************** *** 10,14 **** lib_LTLIBRARIES = libCBM.la ! libCBM_la_SOURCES = Glue.cpp Glue.h 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 *************** *** 43,50 **** inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl ! $(top_srcdir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H) swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $< ! $(top_srcdir)/CBM-PI/CBM.pm: CBM.i $(CBMPI_DEP_H) swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $< --- 43,50 ---- 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) swig -c++ $(INCLUDES) -Wall -proxy -shadow -perl $< |
From: Frederic T. <xf...@us...> - 2007-05-23 17:27:59
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4846 Modified Files: 00-CBMSystem-public.pl 00-XML.pl Log Message: check_null() used (from libtest.pl). See comments in later file. Index: 00-CBMSystem-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** 00-CBMSystem-public.pl 23 May 2007 15:35:41 -0000 1.8 --- 00-CBMSystem-public.pl 23 May 2007 17:27:24 -0000 1.9 *************** *** 13,17 **** sub test_Split { ok($sys->Split("a\nb", "\n", 0) eq "a"); ! ok($sys->Split("a\n\nb", "\n", 1) eq ""); ok($sys->Split("a\nb", "\n", 1) eq "b"); ok($sys->Split("a\nb\n", "\n", 1) eq "b"); --- 13,18 ---- sub test_Split { ok($sys->Split("a\nb", "\n", 0) eq "a"); ! ! ok(check_null($sys->Split("a\n\nb", "\n", 1))); ok($sys->Split("a\nb", "\n", 1) eq "b"); ok($sys->Split("a\nb\n", "\n", 1) eq "b"); *************** *** 20,25 **** ok($sys->Split("4.2.1", ".", 1) eq "2"); ok($sys->Split("4.2.1", ".", 2) eq "1"); ! ok($sys->Split("4.2.1", " ", 0) eq "", "Split('4.2.1', ' ', 0) is ''"); ! ok($sys->Split("4.2.1", " ", 1) eq "", "Split('4.2.1', ' ', 1) is ''"); } --- 21,26 ---- ok($sys->Split("4.2.1", ".", 1) eq "2"); ok($sys->Split("4.2.1", ".", 2) eq "1"); ! ok(check_null($sys->Split("4.2.1", " ", 0)), "Split('4.2.1', ' ', 0) is ''"); ! ok(check_null($sys->Split("4.2.1", " ", 1)), "Split('4.2.1', ' ', 1) is ''"); } Index: 00-XML.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-XML.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** 00-XML.pl 12 Apr 2007 19:59:28 -0000 1.7 --- 00-XML.pl 23 May 2007 17:27:24 -0000 1.8 *************** *** 31,35 **** if (!defined($v)) { ! ok(!defined($value)); } else { ok($v eq $value); --- 31,35 ---- if (!defined($v)) { ! ok(check_null($value)); } else { ok($v eq $value); *************** *** 50,56 **** if (!defined($v)) { ! ok(!defined($value)); } else { - print "V='$v' value='$value'\n"; ok($v eq $value); } --- 50,55 ---- if (!defined($v)) { ! ok(check_null($value)); } else { ok($v eq $value); } *************** *** 69,73 **** if (!defined($v0)) { ! ok(!defined($v1)); } else { ok($v0 eq $v1); --- 68,72 ---- if (!defined($v0)) { ! ok(check_null($v1)); } else { ok($v0 eq $v1); |
From: Frederic T. <xf...@us...> - 2007-05-23 17:26:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4479 Modified Files: config.h.in Log Message: Obsoleted : Gtk2 interface checks. Index: config.h.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.h.in 23 May 2007 15:32:36 -0000 1.3 --- config.h.in 23 May 2007 17:26:51 -0000 1.4 *************** *** 1,7 **** /* libcompbenchmarks/config.h.in. Generated from configure.in by autoheader. */ - /* Gtk2 */ - #undef CBM_GTK2 - /* bzip2 */ #undef CBM_PROG_BZIP2 --- 1,4 ---- |
From: Frederic T. <xf...@us...> - 2007-05-23 17:26:28
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4452 Modified Files: configure.in Log Message: Obsoleted : Gtk2 interface checks. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** configure.in 23 May 2007 15:36:42 -0000 1.30 --- configure.in 23 May 2007 17:26:20 -0000 1.31 *************** *** 211,227 **** fi - AC_MSG_CHECKING([Perl's Gtk2 module]) - `$CBM_PROG_PERL -e 'use Gtk2' 2> /dev/null` - if test $? = 0; then - AC_MSG_RESULT([yes]) - AM_CONDITIONAL(CBM_GTK2, test "1" = "1") - CBM_GTK2="enabled" - else - AC_MSG_RESULT([no, gtk interface disabled.]) - AC_DEFINE_UNQUOTED(CBM_GTK2, 0, [Gtk2]) - AM_CONDITIONAL(CBM_GTK2, test "0" = "1") - CBM_GTK2="disabled" - fi - CXXFLAGS="-Wall -pedantic -O2 -g" --- 211,214 ---- *************** *** 323,326 **** echo "" echo "System : $CBM_SYSTEM" - echo "Gtk2 frontend : $CBM_GTK2" echo "" \ No newline at end of file --- 310,312 ---- |
From: Frederic T. <xf...@us...> - 2007-05-23 17:24:36
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3682 Modified Files: libtest.pl Log Message: check_null() added. Index: libtest.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib/libtest.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libtest.pl 28 Dec 2006 18:51:42 -0000 1.1 --- libtest.pl 23 May 2007 17:24:32 -0000 1.2 *************** *** 35,37 **** --- 35,47 ---- } + # On some systems, passing "" from C++ (e.g. in a std::string) will result + # in "" in Perl land, while sometimes it gives undef. + # + # This should be fixed. + # + sub check_null { + my $str = shift; + + return ((!defined($str)) || ($str eq "")); + } 1; |
From: Frederic T. <xf...@us...> - 2007-05-23 15:46:10
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30751 Modified Files: Makefile.am Removed Files: 06-CBM-LibUI.pl Log Message: LibUI.pl obsoleted. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 17 Apr 2007 20:12:32 -0000 1.14 --- Makefile.am 23 May 2007 15:46:04 -0000 1.15 *************** *** 18,22 **** 05-KB-Option-Logics.pl \ 05-Plan.pl \ - 06-CBM-LibUI.pl \ 07-compbenchmarks-core.pl --- 18,21 ---- *************** *** 32,36 **** $(top_srcdir)/CBM-PI/t/05-KB-Option-Descriptions.pl \ $(top_srcdir)/CBM-PI/t/05-KB-Option-Logics.pl \ - $(top_srcdir)/CBM-PI/t/06-CBM-LibUI.pl \ $(top_srcdir)/CBM-PI/t/07-compbenchmarks-core.pl # $(top_srcdir)/CBM-PI/t/05-Plan.pl --- 31,34 ---- --- 06-CBM-LibUI.pl DELETED --- |
From: Frederic T. <xf...@us...> - 2007-05-23 15:39:51
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28263 Modified Files: Doxyfile Log Message: Minor changes. Index: Doxyfile =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Doxyfile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Doxyfile 30 Jan 2007 21:13:56 -0000 1.9 --- Doxyfile 23 May 2007 15:39:47 -0000 1.10 *************** *** 86,91 **** FILE_PATTERNS = *.c \ *.cc \ - *.cxx \ - *.cpp \ *.c++ \ *.d \ --- 86,89 ---- |