compbench-devel Mailing List for CompBenchmarks (Page 44)
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...> - 2006-09-25 16:44:31
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv740 Added Files: main.h Log Message: First import. Just Doxygen documentation. --- NEW FILE: main.h --- /* ---------------------------------------------------------------------------- $Id: main.h,v 1.1 2006/09/25 16:44:26 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 0.3.0 Internals * * \section intro_sec A foreword * * This document presents source layout and organisation of CompBenchmarks. * As a reminder, this software has been released under the GPL license. * * It'd be useful for developpers or contributers, as well as for people * who like to get an overview about how things are done. * * \section abstraction General organisation * * CompBenchmarks suite has been (re)written in C++, to add more flexibility. * Its core rely on a few abstracts (as in C++) definitions : * - \link CBMSystem operating system\endlink, * - \link CBMBenchmark benchmark\endlink or packages, * - \link CBMBenchmarkContextCompiler compiler\endlink, * - \link CBMUI user interface\endlink. * * Basically, operating system object is detected at CompBenchmarks * compilation time and instancied at run time to get others parts working. * Only one user interface as been coded for actual need, it allows the C++ * core to interact with compbenchmarks-config. Many benchmarks have been * derivated from base benchmark object; each benchmark can use compilers and * options instances (e.g. through the operating system object). * * \section Example * * Compiled on Linux, program'll use a CBMSystemLinux instance. It can install * defined packages (like \link CBMBenchmarkGZIP gzip\endlink or \link * CBMBenchmarkBENCHPP Bench++\endlink) via Internet and uses some benchmarks on them. * Benchmarks can be hard-coded in CompBenchmarks (as, for gzip : \link CBMBenchmarkGZIP1 gzip-1c\endlink) or directly providen by packages (\link CBMBenchmarkBENCHPP_WHETSTONE benchpp-whetstone\endlink). * */ #endif |
|
From: Frederic T. <xf...@us...> - 2006-09-25 16:09:10
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20299 Modified Files: compbenchmarks.1 compbenchmarks.pod Log Message: Minor changes. Index: compbenchmarks.1 =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks.1,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** compbenchmarks.1 25 Sep 2006 16:07:32 -0000 1.1 --- compbenchmarks.1 25 Sep 2006 16:09:06 -0000 1.2 *************** *** 202,206 **** .SH "SEE ALSO" .IX Header "SEE ALSO" ! Manpage of compbenchmarks-config .SH "AUTHOR" .IX Header "AUTHOR" --- 202,206 ---- .SH "SEE ALSO" .IX Header "SEE ALSO" ! Manpage of compbenchmarks\-config. .SH "AUTHOR" .IX Header "AUTHOR" Index: compbenchmarks.pod =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks.pod,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** compbenchmarks.pod 25 Sep 2006 16:07:32 -0000 1.1 --- compbenchmarks.pod 25 Sep 2006 16:09:06 -0000 1.2 *************** *** 77,81 **** =head1 SEE ALSO ! Manpage of compbenchmarks-config =head1 AUTHOR --- 77,81 ---- =head1 SEE ALSO ! Manpage of compbenchmarks-config. =head1 AUTHOR |
|
From: Frederic T. <xf...@us...> - 2006-09-25 16:07:35
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19577 Added Files: compbenchmarks.1 compbenchmarks-config.1 compbenchmarks.pod Log Message: First import. --- NEW FILE: compbenchmarks-config.1 --- .\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 .\" .\" Standard preamble: .\" ======================================================================== .de Sh \" Subsection heading .br .if t .Sp .ne 5 .PP \fB\\$1\fR .PP .. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' 'br\} .\" .\" If the F register is turned on, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} .\" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .hy 0 .if n .na .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "COMPBENCHMARKS-CONFIG 1" .TH COMPBENCHMARKS-CONFIG 1 "2006-09-25" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" compbenchmarks\-config 0.3.0 \- compilers' benchmarking environment .SH "SYNOPSIS" .IX Header "SYNOPSIS" compbenchmarks-config .PP compbenchmarks-config \-\-setup .SH "DESCRIPTION" .IX Header "DESCRIPTION" This tool provides a simple dialog based interface to download, compile and evaluate C/\*(C+ benchmarks more conveniently, according to customizable parameters. .PP Ran without argument, it proposes a dialog based \s-1GUI\s0 to interact with the compbenchmark. .PP Using \-\-setup argument, it checks for basic configuration files and sets up the missing ones, basically according to your environment. .PP compbenchmarks-config uses compbenchmark program. .SH "DIRECTORIES" .IX Header "DIRECTORIES" .IP "~/.compbenchmarks root directory for all related files and directories" 4 .IX Item "~/.compbenchmarks root directory for all related files and directories" .PD 0 .IP "~/.compbenchmarks/Downloads holds downloaded benchmarks" 4 .IX Item "~/.compbenchmarks/Downloads holds downloaded benchmarks" .IP "~/.compbenchmarks/$HOSTNAME your host's dedicated space" 4 .IX Item "~/.compbenchmarks/$HOSTNAME your host's dedicated space" .IP "~/.compbenchmarks/$HOSTNAME/Extracts extract and compilation directory for benchmark's archives" 4 .IX Item "~/.compbenchmarks/$HOSTNAME/Extracts extract and compilation directory for benchmark's archives" .IP "~/.compbenchmarks/$HOSTNAME/Status holds benchmarks' status" 4 .IX Item "~/.compbenchmarks/$HOSTNAME/Status holds benchmarks' status" .IP "~/.compbenchmarks/$HOSTNAME/Configuration configuration file. See below." 4 .IX Item "~/.compbenchmarks/$HOSTNAME/Configuration configuration file. See below." .PD .SH "CONFIGURATION FILES" .IX Header "CONFIGURATION FILES" Files are stored in ~/.compbenchmarks/$HOSTNAME/Configuration/, where \f(CW$HOSTNAME\fR is the shortname of your box. Here's details of files you can found in that directory : .IP "benchmarks : list of the benchmarks selected for evaluation" 4 .IX Item "benchmarks : list of the benchmarks selected for evaluation" .PD 0 .IP "Benchmarks-Run : contains the times each benchmark'll be ran for each particular context" 4 .IX Item "Benchmarks-Run : contains the times each benchmark'll be ran for each particular context" .ie n .IP "default\-compilers\-$LANGUAGE : defines compilers to use for $LANGUAGE (C/\*(C+)" 4 .el .IP "default\-compilers\-$LANGUAGE : defines compilers to use for \f(CW$LANGUAGE\fR (C/\*(C+)" 4 .IX Item "default-compilers-$LANGUAGE : defines compilers to use for $LANGUAGE (C/)" .IP "default\-compilers\-$LANGUAGE\-options : defines compilation options to use for each compiler a given language (C/\*(C+)" 4 .IX Item "default-compilers-$LANGUAGE-options : defines compilation options to use for each compiler a given language (C/)" .PD .SH "SEE ALSO" .IX Header "SEE ALSO" Manpage of compbenchmarks .SH "AUTHOR" .IX Header "AUTHOR" Frederic Trouche --- NEW FILE: compbenchmarks.1 --- .\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32 .\" .\" Standard preamble: .\" ======================================================================== .de Sh \" Subsection heading .br .if t .Sp .ne 5 .PP \fB\\$1\fR .PP .. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. .de Vb \" Begin verbatim text .ft CW .nf .ne \\$1 .. .de Ve \" End verbatim text .ft R .fi .. .\" Set up some character translations and predefined strings. \*(-- will .\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left .\" double quote, and \*(R" will give a right double quote. \*(C+ will .\" give a nicer C++. Capital omega is used to do unbreakable dashes and .\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, .\" nothing in troff, for use with C<>. .tr \(*W- .ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' .ie n \{\ . ds -- \(*W- . ds PI pi . if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch . if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch . ds L" "" . ds R" "" . ds C` "" . ds C' "" 'br\} .el\{\ . ds -- \|\(em\| . ds PI \(*p . ds L" `` . ds R" '' 'br\} .\" .\" If the F register is turned on, we'll generate index entries on stderr for .\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .if \nF \{\ . de IX . tm Index:\\$1\t\\n%\t"\\$2" .. . nr % 0 . rr F .\} .\" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .hy 0 .if n .na .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. . \" fudge factors for nroff and troff .if n \{\ . ds #H 0 . ds #V .8m . ds #F .3m . ds #[ \f1 . ds #] \fP .\} .if t \{\ . ds #H ((1u-(\\\\n(.fu%2u))*.13m) . ds #V .6m . ds #F 0 . ds #[ \& . ds #] \& .\} . \" simple accents for nroff and troff .if n \{\ . ds ' \& . ds ` \& . ds ^ \& . ds , \& . ds ~ ~ . ds / .\} .if t \{\ . ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" . ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' . ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' . ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' . ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' . ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' .\} . \" troff and (daisy-wheel) nroff accents .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' .ds 8 \h'\*(#H'\(*b\h'-\*(#H' .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' .ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] .ds ae a\h'-(\w'a'u*4/10)'e .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ . ds : e . ds 8 ss . ds o a . ds d- d\h'-1'\(ga . ds D- D\h'-1'\(hy . ds th \o'bp' . ds Th \o'LP' . ds ae ae . ds Ae AE .\} .rm #[ #] #H #V #F C .\" ======================================================================== .\" .IX Title "COMPBENCHMARKS 1" .TH COMPBENCHMARKS 1 "2006-09-25" "perl v5.8.8" "User Contributed Perl Documentation" .SH "NAME" compbenchmarks 0.3.0 \- Compilers' benchmarking environment .SH "SYNOPSIS" .IX Header "SYNOPSIS" compbenchmarks \-\-help Show embedded help. .PP compbenchmarks \-\-version Show software version. .PP 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). .PP 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). .PP compbenchmarks \-\-uninstall <b\-id> Uninstall specified benchmark or package. .PP compbenchmarks \-\-list\-benchmarks List all recognized benchmarks/package. .PP compbenchmarks \-\-host\-infos Show host's informations .PP compbenchmarks \-\-program\-infos Show informations about all used external programs .PP compbenchmarks \-\-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++). .PP compbenchmarks \-\-benchmark\-infos <b\-id> Show informations about specified benchmark. .PP compbenchmarks \-\-bench <b\-id> <c\-bin> [c\-options] Make benchmark with specified compiler and options (if given), and returns performance (higher is better). .SH "DESCRIPTION" .IX Header "DESCRIPTION" This tool provides a command line interface to compile and evaluate C/\*(C+ benchmarks more conveniently, according to customizable parameters. .PP Normally used by compbenchmarks-config program. .SH "DIRECTORIES" .IX Header "DIRECTORIES" All but the latest are used by compbenchmark\-config. .IP "~/.compbenchmarks root directory for all related files and directories" 4 .IX Item "~/.compbenchmarks root directory for all related files and directories" .PD 0 .IP "~/.compbenchmarks/Downloads holds downloaded benchmarks" 4 .IX Item "~/.compbenchmarks/Downloads holds downloaded benchmarks" .IP "~/.compbenchmarks/$HOSTNAME your host's dedicated space" 4 .IX Item "~/.compbenchmarks/$HOSTNAME your host's dedicated space" .IP "~/.compbenchmarks/$HOSTNAME/Extracts extract and compilation directory for benchmark's archives" 4 .IX Item "~/.compbenchmarks/$HOSTNAME/Extracts extract and compilation directory for benchmark's archives" .IP "~/.compbenchmarks/$HOSTNAME/Status holds benchmarks' status" 4 .IX Item "~/.compbenchmarks/$HOSTNAME/Status holds benchmarks' status" .IP "~/.compbenchmarks/$HOSTNAME/Configuration configuration file. See below." 4 .IX Item "~/.compbenchmarks/$HOSTNAME/Configuration configuration file. See below." .IP "~/.compbenchmarks/$HOSTNAME/lockfile.pid Lockfile." 4 .IX Item "~/.compbenchmarks/$HOSTNAME/lockfile.pid Lockfile." .PD .SH "SEE ALSO" .IX Header "SEE ALSO" Manpage of compbenchmarks-config .SH "AUTHOR" .IX Header "AUTHOR" Frederic Trouche --- NEW FILE: compbenchmarks.pod --- =head1 NAME compbenchmarks 0.3.0 - Compilers' benchmarking environment =head1 SYNOPSIS compbenchmarks --help 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/package. 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 (like gcc-3.3) or a full path to the compiler binary (/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 better). =head1 DESCRIPTION This tool provides a command line interface to compile and evaluate C/C++ benchmarks more conveniently, according to customizable parameters. Normally used by compbenchmarks-config program. =head1 DIRECTORIES All but the latest are used by compbenchmark-config. =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. =item ~/.compbenchmarks/$HOSTNAME/lockfile.pid Lockfile. =back =head1 SEE ALSO Manpage of compbenchmarks-config =head1 AUTHOR Frederic Trouche |
|
From: Frederic T. <xf...@us...> - 2006-09-25 16:06:52
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19183 Modified Files: Makefile.am Makefile.in Log Message: Manpage for compbenchmarks. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 24 Sep 2006 18:19:25 -0000 1.7 --- Makefile.in 25 Sep 2006 16:06:47 -0000 1.8 *************** *** 117,125 **** noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 INCLUDES = -I $(top_srcdir) ! man_MANS = compbenchmarks-config.1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 117,125 ---- noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 compbenchmarks.pod compbenchmarks.1 INCLUDES = -I $(top_srcdir) ! man_MANS = compbenchmarks-config.1 compbenchmarks.1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs *************** *** 620,623 **** --- 620,626 ---- pod2man $< > $@ + compbenchmarks.1: compbenchmarks.pod + pod2man $< > $@ + install-exec-hook: cp compbenchmarks-config $(DESTDIR)$(bindir) Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 24 Sep 2006 18:19:25 -0000 1.6 --- Makefile.am 25 Sep 2006 16:06:47 -0000 1.7 *************** *** 12,24 **** noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 INCLUDES = -I $(top_srcdir) ! man_MANS = compbenchmarks-config.1 compbenchmarks-config.1: compbenchmarks-config pod2man $< > $@ install-exec-hook: cp compbenchmarks-config $(DESTDIR)$(bindir) --- 12,27 ---- noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 compbenchmarks.pod compbenchmarks.1 INCLUDES = -I $(top_srcdir) ! man_MANS = compbenchmarks-config.1 compbenchmarks.1 compbenchmarks-config.1: compbenchmarks-config pod2man $< > $@ + compbenchmarks.1: compbenchmarks.pod + pod2man $< > $@ + install-exec-hook: cp compbenchmarks-config $(DESTDIR)$(bindir) |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:54:28
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14462 Modified Files: System.cpp System.h Log Message: System specific material directory added (used by Cygwin release only, for now). Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** System.cpp 20 Sep 2006 10:48:43 -0000 1.5 --- System.cpp 25 Sep 2006 15:54:25 -0000 1.6 *************** *** 262,265 **** --- 262,283 ---- } break; + case System: + result=DATAROOTDIR; + result+="/"; + result+=PACKAGE; + result+="/"; + result+=VERSION; + result+="/"; + result+="system"; + if (!checkDirectory(result)) { + result=getenv("PWD"); + result+="/share/system/"; + #ifdef CBM_SYSTEM_CYGWIN + result+="cygwin"; + #else + result=""; + #endif + } + break; default: UI->Fatal("Internal : Bad 'where' parameters in CBMSystem::temporaryDirectory();"); Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** System.h 24 Sep 2006 16:30:43 -0000 1.8 --- System.h 25 Sep 2006 15:54:25 -0000 1.9 *************** *** 28,31 **** --- 28,32 ---- Extract, /*!< Archive extraction temporary directory */ Patches, /*!< Directory holding patches */ + System, /*!< System specific material */ Download, /*!< Downloads temporary directory */ Status, /*!< Directory holding status of packages and |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:49:40
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12471 Modified Files: compbenchmarks-config Log Message: slowdown.sh useless for public. Index: compbenchmarks-config =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** compbenchmarks-config 25 Sep 2006 15:48:30 -0000 1.14 --- compbenchmarks-config 25 Sep 2006 15:49:38 -0000 1.15 *************** *** 856,860 **** my $r = `$cmd`; $SIG{INT} = 'DEFAULT'; - `./slowdown.sh`; my $end = time(); $TOTAL_TIME+=($end-$beg); --- 856,859 ---- |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:48:36
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12071 Modified Files: compbenchmarks-config Log Message: Exists when an unknown option is passed. Man page (pod). Index: compbenchmarks-config =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-config,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** compbenchmarks-config 20 Sep 2006 12:13:09 -0000 1.13 --- compbenchmarks-config 25 Sep 2006 15:48:30 -0000 1.14 *************** *** 856,860 **** my $r = `$cmd`; $SIG{INT} = 'DEFAULT'; ! my $end = time(); $TOTAL_TIME+=($end-$beg); --- 856,860 ---- my $r = `$cmd`; $SIG{INT} = 'DEFAULT'; ! `./slowdown.sh`; my $end = time(); $TOTAL_TIME+=($end-$beg); *************** *** 1051,1054 **** --- 1051,1057 ---- } elsif ($ARGV[0] eq '--setup') { cbmc_setup(); + } else { + print STDERR "Unknown option.\n"; + exit(0); } } else { *************** *** 1077,1078 **** --- 1080,1145 ---- # cbmc_dialog_benchmark_run(); } + + =head1 NAME + + compbenchmarks 0.3.0 - compilers' benchmarking environment + + =head1 SYNOPSIS + + compbenchmarks-config + + compbenchmarks-config --setup + + =head1 DESCRIPTION + + This tool provides a simple dialog based interface to download, compile and + evaluate C/C++ benchmarks more conveniently, according to customizable + parameters. + + Ran without argument, it proposes a dialog based GUI to interact with the + compbenchmark. + + Using --setup argument, it checks for basic configuration files and sets up the + missing ones, basically according to your environment. + + compbenchmarks-config used compbenchmark program. + + =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 CONFIGURATION FILES + + Files are stored in ~/.compbenchmarks/$HOSTNAME/Configuration/, where $HOSTNAME + is the shortname of your box. Here's details of files you can found in that + directory : + + =over + + =item benchmarks : list of the benchmarks selected for evaluation + + =item Benchmarks-Run : contains the times each benchmark'll be ran for each particular context + + =item default-compilers-$LANGUAGE : defines compilers to use for $LANGUAGE (C/C++) + + =item default-compilers-$LANGUAGE-options : defines compilation options to use for each compiler a given language (C/C++) + + =back + + =head1 AUTHOR + + Frederic Trouche |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:47:06
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11309 Modified Files: README Log Message: Cygwin support notified. Index: README =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/README,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** README 24 Sep 2006 18:19:43 -0000 1.7 --- README 25 Sep 2006 15:47:02 -0000 1.8 *************** *** 15,19 **** * Internet connection (needed only to download packages) ! For now, CompilerBenchmarks' suite just supports tcc and gcc compilers on Linux and has only been tested on i686 and compatible systems. Any help improving that is welcome. Installation : --- 15,21 ---- * Internet connection (needed only to download packages) ! * For Cygwin, WMI is needed (embedded since W2K). ! ! For now, CompilerBenchmarks' suite just supports tcc and gcc compilers on Linux and Cygwin. Any help improving that is welcome. It has only been tested on i686 and compatible systems. Installation : |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:42:41
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9710 Modified Files: ChangeLog Log Message: Cygwin support. Possible compilation issues fixed. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChangeLog 24 Sep 2006 16:27:41 -0000 1.3 --- ChangeLog 25 Sep 2006 15:42:37 -0000 1.4 *************** *** 1,7 **** 0.3.0-BETA2 ! Few bug fixes. Internet connection is no longer needed (local packages can be used as input). Man page for compbenchmarks-config. 0.3.0-BETA1 --- 1,8 ---- 0.3.0-BETA2 ! Few bug and compilation fixes. Internet connection is no longer needed (local packages can be used as input). Man page for compbenchmarks-config. + Cygwin support. 0.3.0-BETA1 |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:41:30
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9275 Modified Files: main.cpp Log Message: Cygwin support. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/main.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.cpp 19 Sep 2006 23:19:46 -0000 1.3 --- main.cpp 25 Sep 2006 15:41:24 -0000 1.4 *************** *** 5,8 **** --- 5,12 ---- #endif + #ifdef CBM_SYSTEM_CYGWIN + # include <System/System-Cygwin.h> + #endif + #include <cloptions.h> |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:40:51
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8881 Modified Files: configure configure.in Log Message: Fixes to prevent run-time warning in ./configure during system detection. Index: configure =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure 24 Sep 2006 16:27:41 -0000 1.7 --- configure 25 Sep 2006 15:40:47 -0000 1.8 *************** *** 857,860 **** --- 857,862 ---- CBM_SYSTEM_LINUX_TRUE CBM_SYSTEM_LINUX_FALSE + CBM_SYSTEM_CYGWIN_TRUE + CBM_SYSTEM_CYGWIN_FALSE LIBOBJS LTLIBOBJS' *************** *** 2341,2344 **** --- 2343,2350 ---- CBM_SYSTEM_LINUX=1 ;; + CYGWIN*) + CBM_SYSTEM=CBMSystemCygwin + CBM_SYSTEM_CYGWIN=1 + ;; *) echo "$sys not supported yet." >&2 *************** *** 4523,4527 **** *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4525 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 --- 4529,4533 ---- *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4531 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 *************** *** 6941,6949 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6943: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:6947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 6947,6955 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:6949: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:6953: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 7209,7217 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7211: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:7215: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 7215,7223 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7217: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:7221: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 7313,7321 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7315: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:7319: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 7319,7327 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:7321: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:7325: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 9754,9758 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 9756 "configure" #include "confdefs.h" --- 9760,9764 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 9762 "configure" #include "confdefs.h" *************** *** 9854,9858 **** lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 9856 "configure" #include "confdefs.h" --- 9860,9864 ---- lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF ! #line 9862 "configure" #include "confdefs.h" *************** *** 12222,12230 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:12224: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:12228: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 12228,12236 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:12230: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:12234: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 12326,12334 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:12328: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:12332: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 12332,12340 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:12334: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:12338: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 13887,13895 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13889: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:13893: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 13893,13901 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13895: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:13899: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 13991,13999 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13993: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:13997: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 13997,14005 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:13999: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:14003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 16210,16218 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:16212: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:16216: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 16216,16224 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:16218: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:16222: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 16478,16486 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:16480: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:16484: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized --- 16484,16492 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:16486: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 ! echo "$as_me:16490: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized *************** *** 16582,16590 **** -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:16584: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:16588: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then --- 16588,16596 ---- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` ! (eval echo "\"\$as_me:16590: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 ! echo "$as_me:16594: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then *************** *** 20639,20649 **** cat >>confdefs.h <<_ACEOF ! #define CBM_SYSTEM_LINUX test $CBM_SYSTEM_LINUX = 1 _ACEOF ! if test $CBM_SYSTEM_LINUX = 1; then CBM_SYSTEM_LINUX_TRUE= CBM_SYSTEM_LINUX_FALSE='#' --- 20645,20661 ---- + if test "$CBM_SYSTEM_LINUX"x = "1x"; then + sys_linux_def=1 + else + sys_linux_def=0 + fi + cat >>confdefs.h <<_ACEOF ! #define CBM_SYSTEM_LINUX $sys_linux_def _ACEOF ! if test "$CBM_SYSTEM_LINUX"x = "1x"; then CBM_SYSTEM_LINUX_TRUE= CBM_SYSTEM_LINUX_FALSE='#' *************** *** 20653,20660 **** fi top_srcdir=`cd $srcdir; pwd`; ! ac_config_files="$ac_config_files share/Makefile share/patches/Makefile System/Makefile Benchmark/Compiler/Makefile Benchmark/Makefile UI/Makefile Makefile" cat >confcache <<\_ACEOF --- 20665,20692 ---- fi + if test "$CBM_SYSTEM_CYGWIN"x = "1x"; then + sys_cygwin_def=1 + else + sys_cygwin_def=0 + fi + + cat >>confdefs.h <<_ACEOF + #define CBM_SYSTEM_CYGWIN $sys_cygwin_def + _ACEOF + + + + if test "$CBM_SYSTEM_CYGWIN" = "1x"; then + CBM_SYSTEM_CYGWIN_TRUE= + CBM_SYSTEM_CYGWIN_FALSE='#' + else + CBM_SYSTEM_CYGWIN_TRUE='#' + CBM_SYSTEM_CYGWIN_FALSE= + fi + top_srcdir=`cd $srcdir; pwd`; ! ac_config_files="$ac_config_files share/Makefile share/patches/Makefile share/system/Makefile share/system/cygwin/Makefile System/Makefile Benchmark/Compiler/Makefile Benchmark/Makefile UI/Makefile Makefile" cat >confcache <<\_ACEOF *************** *** 21211,21214 **** --- 21243,21248 ---- "share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;; "share/patches/Makefile") CONFIG_FILES="$CONFIG_FILES share/patches/Makefile" ;; + "share/system/Makefile") CONFIG_FILES="$CONFIG_FILES share/system/Makefile" ;; + "share/system/cygwin/Makefile") CONFIG_FILES="$CONFIG_FILES share/system/cygwin/Makefile" ;; "System/Makefile") CONFIG_FILES="$CONFIG_FILES System/Makefile" ;; "Benchmark/Compiler/Makefile") CONFIG_FILES="$CONFIG_FILES Benchmark/Compiler/Makefile" ;; *************** *** 21423,21431 **** CBM_SYSTEM_LINUX_TRUE!$CBM_SYSTEM_LINUX_TRUE$ac_delim CBM_SYSTEM_LINUX_FALSE!$CBM_SYSTEM_LINUX_FALSE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then break elif $ac_last_try; then --- 21457,21467 ---- CBM_SYSTEM_LINUX_TRUE!$CBM_SYSTEM_LINUX_TRUE$ac_delim CBM_SYSTEM_LINUX_FALSE!$CBM_SYSTEM_LINUX_FALSE$ac_delim + CBM_SYSTEM_CYGWIN_TRUE!$CBM_SYSTEM_CYGWIN_TRUE$ac_delim + CBM_SYSTEM_CYGWIN_FALSE!$CBM_SYSTEM_CYGWIN_FALSE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then break elif $ac_last_try; then Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.in 24 Sep 2006 16:27:42 -0000 1.7 --- configure.in 25 Sep 2006 15:40:47 -0000 1.8 *************** *** 16,19 **** --- 16,23 ---- CBM_SYSTEM_LINUX=1 ;; + CYGWIN*) + CBM_SYSTEM=CBMSystemCygwin + CBM_SYSTEM_CYGWIN=1 + ;; *) echo "$sys not supported yet." >&2 *************** *** 214,219 **** AC_DEFINE_UNQUOTED(PREFIX, "$pprefix", [Installation prefix]) AC_DEFINE_UNQUOTED(CBM_SYSTEM, $CBM_SYSTEM, [System]) ! AC_DEFINE_UNQUOTED(CBM_SYSTEM_LINUX, test $CBM_SYSTEM_LINUX = 1, [Linux]) ! AM_CONDITIONAL(CBM_SYSTEM_LINUX, test $CBM_SYSTEM_LINUX = 1) top_srcdir=`cd $srcdir; pwd`; --- 218,237 ---- AC_DEFINE_UNQUOTED(PREFIX, "$pprefix", [Installation prefix]) AC_DEFINE_UNQUOTED(CBM_SYSTEM, $CBM_SYSTEM, [System]) ! ! if test "$CBM_SYSTEM_LINUX"x = "1x"; then ! sys_linux_def=1 ! else ! sys_linux_def=0 ! fi ! AC_DEFINE_UNQUOTED(CBM_SYSTEM_LINUX, $sys_linux_def, [Linux]) ! AM_CONDITIONAL(CBM_SYSTEM_LINUX, test "$CBM_SYSTEM_LINUX"x = "1x") ! ! if test "$CBM_SYSTEM_CYGWIN"x = "1x"; then ! sys_cygwin_def=1 ! else ! sys_cygwin_def=0 ! fi ! AC_DEFINE_UNQUOTED(CBM_SYSTEM_CYGWIN, $sys_cygwin_def, [Cygwin]) ! AM_CONDITIONAL(CBM_SYSTEM_CYGWIN, test "$CBM_SYSTEM_CYGWIN" = "1x") top_srcdir=`cd $srcdir; pwd`; *************** *** 222,225 **** --- 240,245 ---- AC_OUTPUT(share/Makefile share/patches/Makefile + share/system/Makefile + share/system/cygwin/Makefile System/Makefile Benchmark/Compiler/Makefile |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:39:38
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8472 Modified Files: config.h.in Log Message: Cygwin support. Index: config.h.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/config.h.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.h.in 20 Sep 2006 10:46:24 -0000 1.5 --- config.h.in 25 Sep 2006 15:39:33 -0000 1.6 *************** *** 61,64 **** --- 61,67 ---- #undef CBM_SYSTEM + /* Cygwin */ + #undef CBM_SYSTEM_CYGWIN + /* Linux */ #undef CBM_SYSTEM_LINUX |
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8076 Modified Files: Benchmark-Autotools.cpp Benchmark-BENCHPP.cpp Benchmark.cpp Benchmark-NBENCH.cpp Benchmark-SCIMARK2.cpp Benchmark-xZIP.cpp Log Message: Fixes possible compilation issues. Index: Benchmark-BENCHPP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BENCHPP.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-BENCHPP.cpp 18 Sep 2006 18:58:11 -0000 1.2 --- Benchmark-BENCHPP.cpp 25 Sep 2006 15:38:48 -0000 1.3 *************** *** 87,91 **** { std::string cmd; ! std::string stdout; int r; std::string patch; --- 87,91 ---- { std::string cmd; ! std::string sstdout; int r; std::string patch; *************** *** 106,110 **** cmd+=CBM_PROG_PATCH; cmd+=" -p0 Configure"; ! r=system->exec(cmd, stdout); return(!r); } --- 106,110 ---- cmd+=CBM_PROG_PATCH; cmd+=" -p0 Configure"; ! r=system->exec(cmd, sstdout); return(!r); } *************** *** 114,118 **** std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string stdout; cmd+="cd "; --- 114,118 ---- std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string sstdout; cmd+="cd "; *************** *** 126,130 **** cmd+=" xvf -"; ! return(system->exec(cmd, stdout)==0); } --- 126,130 ---- cmd+=" xvf -"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 138,142 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 138,142 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 151,155 **** cmd+=" | ./Configure"; ! return(system->exec(cmd, stdout)==0); } --- 151,155 ---- cmd+=" | ./Configure"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 157,161 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 157,161 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 189,193 **** cmd+="' 2> /dev/null"; ! return(system->exec(cmd, stdout)==0); } --- 189,193 ---- cmd+="' 2> /dev/null"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 219,223 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 219,223 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 227,231 **** cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, stdout)==0); } --- 227,231 ---- cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, sstdout)==0); } Index: Benchmark-NBENCH.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-NBENCH.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-NBENCH.cpp 10 Sep 2006 20:44:55 -0000 1.2 --- Benchmark-NBENCH.cpp 25 Sep 2006 15:38:51 -0000 1.3 *************** *** 89,93 **** std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string stdout; cmd+="cd "; --- 89,93 ---- std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string sstdout; cmd+="cd "; *************** *** 101,105 **** cmd+=" xvf -"; ! return(system->exec(cmd, stdout)==0); } --- 101,105 ---- cmd+=" xvf -"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 119,123 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 119,123 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 151,155 **** cmd+="'"; ! return(system->exec(cmd, stdout)==0); } --- 151,155 ---- cmd+="'"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 180,184 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 180,184 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 188,192 **** cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, stdout)==0); } --- 188,192 ---- cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, sstdout)==0); } Index: Benchmark-xZIP.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-xZIP.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Benchmark-xZIP.cpp 10 Sep 2006 20:43:39 -0000 1.1 --- Benchmark-xZIP.cpp 25 Sep 2006 15:38:51 -0000 1.2 *************** *** 34,38 **** std::string cmd; std::string result; ! std::string stdout; char dum[16] = { 0 }; --- 34,38 ---- std::string cmd; std::string result; ! std::string sstdout; char dum[16] = { 0 }; *************** *** 45,49 **** cmd+="c Compbenchmarks.dat > /dev/null"; ! if (system->exec(cmd, stdout)==0) { end=system->Time(); sprintf(dum, "%0.0f", ((float)benchmarkSize())/((int)(end-start))); --- 45,49 ---- cmd+="c Compbenchmarks.dat > /dev/null"; ! if (system->exec(cmd, sstdout)==0) { end=system->Time(); sprintf(dum, "%0.0f", ((float)benchmarkSize())/((int)(end-start))); Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Benchmark.cpp 24 Sep 2006 16:30:00 -0000 1.8 --- Benchmark.cpp 25 Sep 2006 15:38:51 -0000 1.9 *************** *** 77,85 **** cmd+=CBM_PROG_RM; cmd+=" -rf "; ! std::string stdout; cmd+=where; ! return(system->exec(cmd, stdout)==0); } --- 77,85 ---- cmd+=CBM_PROG_RM; cmd+=" -rf "; ! std::string sstdout; cmd+=where; ! return(system->exec(cmd, sstdout)==0); } Index: Benchmark-SCIMARK2.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-SCIMARK2.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Benchmark-SCIMARK2.cpp 14 Sep 2006 17:41:46 -0000 1.3 --- Benchmark-SCIMARK2.cpp 25 Sep 2006 15:38:51 -0000 1.4 *************** *** 72,76 **** { std::string cmd; ! std::string stdout; int r; std::string patch; --- 72,76 ---- { std::string cmd; ! std::string sstdout; int r; std::string patch; *************** *** 91,95 **** cmd+=CBM_PROG_PATCH; cmd+=" -p0 scimark2.c"; ! r=system->exec(cmd, stdout); return(!r); } --- 91,95 ---- cmd+=CBM_PROG_PATCH; cmd+=" -p0 scimark2.c"; ! r=system->exec(cmd, sstdout); return(!r); } *************** *** 99,103 **** std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string stdout; cmd+="cd "; --- 99,103 ---- std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string sstdout; cmd+="cd "; *************** *** 116,120 **** cmd+=localPackageName(); ! return(system->exec(cmd, stdout)==0); } --- 116,120 ---- cmd+=localPackageName(); ! return(system->exec(cmd, sstdout)==0); } *************** *** 133,137 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 133,137 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 165,169 **** cmd+="'"; ! return(system->exec(cmd, stdout)==0); } --- 165,169 ---- cmd+="'"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 195,199 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 195,199 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 203,207 **** cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, stdout)==0); } --- 203,207 ---- cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, sstdout)==0); } Index: Benchmark-Autotools.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-Autotools.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Benchmark-Autotools.cpp 10 Sep 2006 20:42:44 -0000 1.2 --- Benchmark-Autotools.cpp 25 Sep 2006 15:38:48 -0000 1.3 *************** *** 15,19 **** std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string stdout; cmd+="cd "; --- 15,19 ---- std::string localFile = localPackageAbsoluteName(); std::string cmd; ! std::string sstdout; cmd+="cd "; *************** *** 27,31 **** cmd+=" xvf -"; ! return(system->exec(cmd, stdout)==0); } --- 27,31 ---- cmd+=" xvf -"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 35,39 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 35,39 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 69,73 **** cmd+=" ./configure"; ! return(system->exec(cmd, stdout)==0); } --- 69,73 ---- cmd+=" ./configure"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 75,79 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 75,79 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 83,87 **** cmd+=" 2> /dev/null"; ! return(system->exec(cmd, stdout)==0); } --- 83,87 ---- cmd+=" 2> /dev/null"; ! return(system->exec(cmd, sstdout)==0); } *************** *** 89,93 **** { std::string cmd; ! std::string stdout; cmd="cd "; --- 89,93 ---- { std::string cmd; ! std::string sstdout; cmd="cd "; *************** *** 97,101 **** cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, stdout)==0); } --- 97,101 ---- cmd+=" clean 2> /dev/null"; ! return(system->exec(cmd, sstdout)==0); } |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:38:18
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8025 Modified Files: Makefile.in Log Message: Cygwin support. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 25 Sep 2006 15:26:39 -0000 1.5 --- Makefile.in 25 Sep 2006 15:38:15 -0000 1.6 *************** *** 159,162 **** --- 159,164 ---- TAR = tar GZIP_ENV = --best + DEP_FILES = .deps/System-Cygwin.P .deps/System-Linux.P \ + .deps/System-Unix.P .deps/System.P .deps/md5.P SOURCES = $(libSystem_la_SOURCES) OBJECTS = $(libSystem_la_OBJECTS) *************** *** 166,172 **** .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps System/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 168,174 ---- .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu System/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 182,188 **** maintainer-clean-noinstLTLIBRARIES: - .c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. --- 184,187 ---- *************** *** 207,213 **** maintainer-clean-compile: - .c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< --- 206,209 ---- *************** *** 269,272 **** --- 265,273 ---- distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu System/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ *************** *** 279,282 **** --- 280,334 ---- fi; \ done + + DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + + -include $(DEP_FILES) + + mostlyclean-depend: + + clean-depend: + + distclean-depend: + -rm -rf .deps + + maintainer-clean-depend: + + %.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + + %.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + + %.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + + %.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am *************** *** 315,319 **** maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic --- 367,371 ---- maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic *************** *** 321,331 **** clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am -rm -f libtool --- 373,383 ---- clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am -rm -f libtool *************** *** 334,339 **** maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 386,391 ---- maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 346,355 **** maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # -I /usr/include/w3c-libwww # !!! --- 398,409 ---- maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir \ ! mostlyclean-depend distclean-depend clean-depend \ ! maintainer-clean-depend info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # -I /usr/include/w3c-libwww # !!! |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:36:54
|
Update of /cvsroot/compbench/CompBenchmarks++/share In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7258 Modified Files: Makefile.am Makefile.in Log Message: Cygwin support. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/share/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 20 Sep 2006 10:48:21 -0000 1.2 --- Makefile.in 25 Sep 2006 15:36:50 -0000 1.3 *************** *** 105,109 **** VERSION = @VERSION@ ! SUBDIRS = patches mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h --- 105,109 ---- VERSION = @VERSION@ ! SUBDIRS = patches system mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/share/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 10 Sep 2006 20:38:42 -0000 1.1 --- Makefile.am 25 Sep 2006 15:36:50 -0000 1.2 *************** *** 1 **** ! SUBDIRS = patches \ No newline at end of file --- 1 ---- ! SUBDIRS = patches system \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:36:54
|
Update of /cvsroot/compbench/CompBenchmarks++/share/system In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7258/system Added Files: Makefile.am Makefile.in Log Message: Cygwin support. --- NEW FILE: Makefile.in --- # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AR = @AR@ AS = @AS@ CBM_PROG_BZIP2 = @CBM_PROG_BZIP2@ CBM_PROG_CAT = @CBM_PROG_CAT@ CBM_PROG_CP = @CBM_PROG_CP@ CBM_PROG_CUT = @CBM_PROG_CUT@ CBM_PROG_DD = @CBM_PROG_DD@ CBM_PROG_DIALOG = @CBM_PROG_DIALOG@ CBM_PROG_GREP = @CBM_PROG_GREP@ CBM_PROG_GZIP = @CBM_PROG_GZIP@ CBM_PROG_HEAD = @CBM_PROG_HEAD@ CBM_PROG_MAKE = @CBM_PROG_MAKE@ CBM_PROG_MKDIR = @CBM_PROG_MKDIR@ CBM_PROG_PATCH = @CBM_PROG_PATCH@ CBM_PROG_PERL = @CBM_PROG_PERL@ CBM_PROG_RM = @CBM_PROG_RM@ CBM_PROG_TAIL = @CBM_PROG_TAIL@ CBM_PROG_TAR = @CBM_PROG_TAR@ CBM_PROG_UNZIP = @CBM_PROG_UNZIP@ CBM_PROG_WGET = @CBM_PROG_WGET@ CBM_PROG_ZCAT = @CBM_PROG_ZCAT@ CC = @CC@ CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ HAVE_LIB = @HAVE_LIB@ LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIB = @LTLIB@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ RC = @RC@ STRIP = @STRIP@ VERSION = @VERSION@ SUBDIRS = cygwin mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu share/system/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. @SET_MAKE@ all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-am"; \ else \ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ local_target="$$target-am"; \ else \ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) mostlyclean-tags: clean-tags: distclean-tags: -rm -f TAGS ID maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = share/system distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu share/system/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done for subdir in $(SUBDIRS); do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ chmod 777 $(distdir)/$$subdir; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done info-am: info: info-recursive dvi-am: dvi: dvi-recursive check-am: all-am check: check-recursive installcheck-am: installcheck: installcheck-recursive install-exec-am: install-exec: install-exec-recursive install-data-am: install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive uninstall-am: uninstall: uninstall-recursive all-am: Makefile all-redirect: all-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: mostlyclean-am: mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-tags clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-tags distclean-generic clean-am -rm -f libtool distclean: distclean-recursive maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive .PHONY: install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ install-exec install-data-am install-data install-am install \ uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: Makefile.am --- SUBDIRS = cygwin |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:36:31
|
Update of /cvsroot/compbench/CompBenchmarks++/share/system/cygwin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv7230 Added Files: Makefile.am Makefile.in systemInfo.vbs Log Message: Cygwin support. --- NEW FILE: Makefile.in --- # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ datadir = @datadir@ sysconfdir = @sysconfdir@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ AR = @AR@ AS = @AS@ CBM_PROG_BZIP2 = @CBM_PROG_BZIP2@ CBM_PROG_CAT = @CBM_PROG_CAT@ CBM_PROG_CP = @CBM_PROG_CP@ CBM_PROG_CUT = @CBM_PROG_CUT@ CBM_PROG_DD = @CBM_PROG_DD@ CBM_PROG_DIALOG = @CBM_PROG_DIALOG@ CBM_PROG_GREP = @CBM_PROG_GREP@ CBM_PROG_GZIP = @CBM_PROG_GZIP@ CBM_PROG_HEAD = @CBM_PROG_HEAD@ CBM_PROG_MAKE = @CBM_PROG_MAKE@ CBM_PROG_MKDIR = @CBM_PROG_MKDIR@ CBM_PROG_PATCH = @CBM_PROG_PATCH@ CBM_PROG_PERL = @CBM_PROG_PERL@ CBM_PROG_RM = @CBM_PROG_RM@ CBM_PROG_TAIL = @CBM_PROG_TAIL@ CBM_PROG_TAR = @CBM_PROG_TAR@ CBM_PROG_UNZIP = @CBM_PROG_UNZIP@ CBM_PROG_WGET = @CBM_PROG_WGET@ CBM_PROG_ZCAT = @CBM_PROG_ZCAT@ CC = @CC@ CXX = @CXX@ CXXCPP = @CXXCPP@ DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ HAVE_LIB = @HAVE_LIB@ LIB = @LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIB = @LTLIB@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ RC = @RC@ STRIP = @STRIP@ VERSION = @VERSION@ source_sys = systemInfo.vbs @CBM_SYSTEM_CYGWIN_TRUE@data_DATA = $(source_sys) datarootdir = @datarootdir@/compbenchmarks/@VERSION@/system EXTRA_DIST = $(source_sys) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = DATA = $(data_DATA) DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu share/system/cygwin/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(datadir) @list='$(data_DATA)'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p; \ else if test -f $$p; then \ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p"; \ $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p; \ fi; fi; \ done uninstall-dataDATA: @$(NORMAL_UNINSTALL) list='$(data_DATA)'; for p in $$list; do \ rm -f $(DESTDIR)$(datadir)/$$p; \ done tags: TAGS TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = share/system/cygwin distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu share/system/cygwin/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done info-am: info: info-am dvi-am: dvi: dvi-am check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am install-exec-am: install-exec: install-exec-am install-data-am: install-dataDATA install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am uninstall-am: uninstall-dataDATA uninstall: uninstall-am all-am: Makefile $(DATA) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(datadir) mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: mostlyclean-am: mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am .PHONY: uninstall-dataDATA install-dataDATA tags distdir info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ install-exec install-data-am install-data install-am install \ uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE: Makefile.am --- source_sys = systemInfo.vbs if CBM_SYSTEM_CYGWIN data_DATA = $(source_sys) endif datarootdir = @datarootdir@/compbenchmarks/@VERSION@/system EXTRA_DIST = $(source_sys) --- NEW FILE: systemInfo.vbs --- On Error Resume Next strComputer = "." Set objWMIService = GetObject("winmgmts:\\" & strComputer & "\root\cimv2") Set colItems = objWMIService.ExecQuery("Select * from Win32_Processor",,48) Set n = 0 For Each objItem in colItems If (n=0) Then Wscript.Echo Trim(objItem.CurrentClockSpeed) Wscript.Echo Trim(objItem.L2CacheSize) Wscript.Echo Trim(objItem.Name) End if n=n+1 Next Wscript.Echo n |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:35:54
|
Update of /cvsroot/compbench/CompBenchmarks++/share/system/cygwin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6849/cygwin Log Message: Directory /cvsroot/compbench/CompBenchmarks++/share/system/cygwin added to the repository |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:35:30
|
Update of /cvsroot/compbench/CompBenchmarks++/share/system In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6825/system Log Message: Directory /cvsroot/compbench/CompBenchmarks++/share/system added to the repository |
|
From: Frederic T. <xf...@us...> - 2006-09-25 15:26:44
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3376 Modified Files: Makefile.am Makefile.in Added Files: System-Cygwin.cpp System-Cygwin.h Log Message: Cygwin support. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 20 Sep 2006 10:48:43 -0000 1.4 --- Makefile.in 25 Sep 2006 15:26:39 -0000 1.5 *************** *** 106,111 **** noinst_LTLIBRARIES = libSystem.la - @CBM_SYSTEM_LINUX_TRUE@source_sys = System-Linux.cpp sources = System.cpp System-Unix.cpp md5.cpp --- 106,111 ---- noinst_LTLIBRARIES = libSystem.la @CBM_SYSTEM_LINUX_TRUE@source_sys = System-Linux.cpp + @CBM_SYSTEM_LINUX_FALSE@@CBM_SYSTEM_CYGWIN_TRUE@source_sys = System-Cygwin.cpp sources = System.cpp System-Unix.cpp md5.cpp *************** *** 132,139 **** libSystem_la_LDFLAGS = libSystem_la_LIBADD = ! @CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = System.lo System-Unix.lo \ ! @CBM...@md... ! @CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = System.lo System-Unix.lo \ ! @CBM...@md... System-Linux.lo CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --- 132,149 ---- libSystem_la_LDFLAGS = libSystem_la_LIBADD = ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... md5.lo ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... md5.lo \ ! @CBM_SYSTEM_CYGWIN_FALSE@@CBM...@Sy... ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_LINUX_TRUE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... System-Unix.lo \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@md... System-Linux.lo ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM_SYSTEM_LINUX_FALSE@libSystem_la_OBJECTS = \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... md5.lo \ ! @CBM_SYSTEM_CYGWIN_TRUE@@CBM...@Sy... CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) *************** *** 149,154 **** TAR = tar GZIP_ENV = --best - DEP_FILES = .deps/System-Linux.P .deps/System-Unix.P .deps/System.P \ - .deps/md5.P SOURCES = $(libSystem_la_SOURCES) OBJECTS = $(libSystem_la_OBJECTS) --- 159,162 ---- *************** *** 158,164 **** .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu System/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 166,172 ---- .SUFFIXES: .S .c .cpp .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps System/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 174,177 **** --- 182,188 ---- maintainer-clean-noinstLTLIBRARIES: + .c.o: + $(COMPILE) -c $< + # FIXME: We should only use cygpath when building on Windows, # and only if it is available. *************** *** 196,199 **** --- 207,213 ---- maintainer-clean-compile: + .c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< *************** *** 255,263 **** distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu System/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ --- 269,272 ---- *************** *** 270,324 **** fi; \ done - - DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - - -include $(DEP_FILES) - - mostlyclean-depend: - - clean-depend: - - distclean-depend: - -rm -rf .deps - - maintainer-clean-depend: - - %.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - - %.o: %.cpp - @echo '$(CXXCOMPILE) -c $<'; \ - $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - - %.lo: %.cpp - @echo '$(LTCXXCOMPILE) -c $<'; \ - $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp info-am: info: info-am --- 279,282 ---- *************** *** 357,361 **** maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic --- 315,319 ---- maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic *************** *** 363,373 **** clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-depend \ ! distclean-generic clean-am -rm -f libtool --- 321,331 ---- clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am -rm -f libtool *************** *** 376,381 **** maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-depend \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 334,339 ---- maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 388,399 **** maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir \ ! mostlyclean-depend distclean-depend clean-depend \ ! maintainer-clean-depend info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # -I /usr/include/w3c-libwww # !!! --- 346,355 ---- maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # -I /usr/include/w3c-libwww # !!! --- NEW FILE: System-Cygwin.cpp --- #include <System/System-Cygwin.h> #include <string> #include <config.h> /* !!! */ CBMSystemCygwin::CBMSystemCygwin() : CBMSystemUnix() { std::string cmd = "cscript.exe /nologo systemInfo.wmi"; exec(cmd, cache); } std::string CBMSystemCygwin::Split(const std::string& str, const std::string& delim, int wantedIndex) { unsigned int offset = 0; unsigned int delimIndex = 0; unsigned int nowIndex = 0; delimIndex = str.find(delim, offset); while (delimIndex != std::string::npos) { if (wantedIndex==nowIndex) return(str.substr(offset, delimIndex - offset)); offset += delimIndex - offset + delim.length(); delimIndex = str.find(delim, offset); nowIndex++; } if (wantedIndex==nowIndex) return(str.substr(offset)); else return(""); } std::string CBMSystemCygwin::processor_name(void) { return(Split(cache, "\n", 2)); } std::string CBMSystemCygwin::processor_mhz(void) { return(Split(cache, "\n", 0)); } std::string CBMSystemCygwin::processor_cache(void) { return(Split(cache, "\n", 1)); } std::string CBMSystemCygwin::processor_number(void) { return(Split(cache, "\n", 3)); } CBMSystemCygwin::~CBMSystemCygwin() { } Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 11 Sep 2006 18:29:26 -0000 1.3 --- Makefile.am 25 Sep 2006 15:26:39 -0000 1.4 *************** *** 3,6 **** --- 3,10 ---- if CBM_SYSTEM_LINUX source_sys = System-Linux.cpp + else + if CBM_SYSTEM_CYGWIN + source_sys = System-Cygwin.cpp + endif endif --- NEW FILE: System-Cygwin.h --- /* ---------------------------------------------------------------------------- $Id: System-Cygwin.h,v 1.1 2006/09/25 15:26:39 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_CBMSYSTEMCYGWIN #define H_CBMSYSTEMCYGWIN #include <System/System-Unix.h> /** \brief Cygwin operating system support class. * * Implements a few methods not defined by CBMSystemUnix to handle properly * Cygwin systems in CompBenchmarks. */ class CBMSystemCygwin : public CBMSystemUnix { private: std::string cache; virtual std::string Split(const std::string& str, const std::string& delim, int wantedIndex); protected: public: /** Constructor */ CBMSystemCygwin(); /** Returns processor name * Uses WMI to get the name of the first installed processor. * \return Processor name, as clear text * \sa processor_number() */ virtual std::string processor_name(void); /** Returns processor speed * Uses WMI to get the speed, in MHz, of the first installed processor. * \return Processor speed in MHz, as clear text (integer returned) * \sa processor_number() */ virtual std::string processor_mhz(void); /** Returns processor cache * Uses WMI to get processor second level cache in Kb. Integer expected. * \return std::string coding (first) processor second level cache in Kb. */ virtual std::string processor_cache(void); /** Returns processors' number * Uses WMI to get information. * \return std::string coding the number of processors (physical and logical) on host */ virtual std::string processor_number(void); /** Virtual destructor */ virtual ~CBMSystemCygwin(); }; #endif |
|
From: Frederic T. <xf...@us...> - 2006-09-24 18:19:53
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29290 Modified Files: README Log Message: Remark about Idle system when benchmarking. Index: README =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/README,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** README 24 Sep 2006 16:27:42 -0000 1.6 --- README 24 Sep 2006 18:19:43 -0000 1.7 *************** *** 45,48 **** --- 45,51 ---- * Run ./compbenchmarks-config + * Insure that the system is idle (e.g. X server stopped) before starting + benchmarks. + * If you don't have an internet connection, look at the --fetch of compbenchmarks. It'll import a local archive as a known benchmark package. |
|
From: Frederic T. <xf...@us...> - 2006-09-24 18:19:29
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29274 Modified Files: Makefile.am Makefile.in Log Message: Fix in man-page handling. Index: Makefile.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 20 Sep 2006 16:47:21 -0000 1.6 --- Makefile.in 24 Sep 2006 18:19:25 -0000 1.7 *************** *** 117,123 **** noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile INCLUDES = -I $(top_srcdir) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 117,125 ---- noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 INCLUDES = -I $(top_srcdir) + + man_MANS = compbenchmarks-config.1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs *************** *** 141,144 **** --- 143,150 ---- CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ + man1dir = $(mandir)/man1 + MANS = $(man_MANS) + + NROFF = nroff HEADERS = $(noinst_HEADERS) *************** *** 276,279 **** --- 282,324 ---- $(LTCXXCOMPILE) -c $< + install-man1: + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done + + uninstall-man1: + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + install-man: $(MANS) + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-man1 + uninstall-man: + @$(NORMAL_UNINSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. *************** *** 495,499 **** install-exec: install-exec-recursive ! install-data-am: install-data: install-data-recursive --- 540,544 ---- install-exec: install-exec-recursive ! install-data-am: install-man install-data: install-data-recursive *************** *** 501,507 **** @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive ! uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-recursive ! all-am: Makefile $(PROGRAMS) $(HEADERS) config.h all-redirect: all-recursive-am install-strip: --- 546,552 ---- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive ! uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall: uninstall-recursive ! all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h all-redirect: all-recursive-am install-strip: *************** *** 509,513 **** installdirs: installdirs-recursive installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(bindir) --- 554,558 ---- installdirs: installdirs-recursive installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 *************** *** 555,559 **** mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ --- 600,605 ---- mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool install-man1 uninstall-man1 \ ! install-man uninstall-man install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ *************** *** 571,574 **** --- 617,623 ---- + compbenchmarks-config.1: compbenchmarks-config + pod2man $< > $@ + install-exec-hook: cp compbenchmarks-config $(DESTDIR)$(bindir) Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 20 Sep 2006 16:47:21 -0000 1.5 --- Makefile.am 24 Sep 2006 18:19:25 -0000 1.6 *************** *** 12,19 **** noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile INCLUDES = -I $(top_srcdir) install-exec-hook: ! cp compbenchmarks-config $(DESTDIR)$(bindir) \ No newline at end of file --- 12,24 ---- noinst_HEADERS = cloptions.h main.h ! EXTRA_DIST = compbenchmarks-config Doxyfile compbenchmarks-config.1 INCLUDES = -I $(top_srcdir) + man_MANS = compbenchmarks-config.1 + + compbenchmarks-config.1: compbenchmarks-config + pod2man $< > $@ + install-exec-hook: ! cp compbenchmarks-config $(DESTDIR)$(bindir) |
|
From: Frederic T. <xf...@us...> - 2006-09-24 18:14:21
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27425 Modified Files: cloptions.cpp Log Message: Fix on --fetch option. Index: cloptions.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/cloptions.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cloptions.cpp 24 Sep 2006 16:28:38 -0000 1.5 --- cloptions.cpp 24 Sep 2006 18:14:16 -0000 1.6 *************** *** 62,66 **** {"version", 0, 0, 'v'}, {"install", 1, 0, 'i' }, ! {"fetch", 1, 0, 'f'}, {"uninstall", 1, 0, 'u' }, {"list-benchmarks", 0, 0, 'L'}, --- 62,66 ---- {"version", 0, 0, 'v'}, {"install", 1, 0, 'i' }, ! {"fetch", 1, 0, 'F'}, {"uninstall", 1, 0, 'u' }, {"list-benchmarks", 0, 0, 'L'}, *************** *** 143,147 **** } bench=optarg; - printf("bid='%s'\n", bench.c_str()); B=SB.select((char*) bench.c_str()); if (!B) { --- 143,146 ---- *************** *** 150,154 **** break; } - printf("bench found.\n"); optind++; if (optind<=argc) { --- 149,152 ---- |
|
From: Frederic T. <xf...@us...> - 2006-09-24 16:30:48
|
Update of /cvsroot/compbench/CompBenchmarks++/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21947 Modified Files: System.h System-Unix.cpp System-Unix.h Log Message: Changes requiered by fetch mode. Index: System-Unix.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Unix.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** System-Unix.cpp 14 Sep 2006 17:42:53 -0000 1.2 --- System-Unix.cpp 24 Sep 2006 16:30:43 -0000 1.3 *************** *** 23,26 **** --- 23,39 ---- } + int CBMSystemUnix::copy(std::string from, std::string to) + { + std::string cmd; + std::string stdout; + + cmd="cp -f "; + cmd+=from; + cmd+=" "; + cmd+=to; + + return(exec(cmd, stdout)); + } + int CBMSystemUnix::exec(std::string& command, std::string& result) { Index: System-Unix.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System-Unix.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** System-Unix.h 19 Sep 2006 17:08:24 -0000 1.3 --- System-Unix.h 24 Sep 2006 16:30:43 -0000 1.4 *************** *** 32,35 **** --- 32,37 ---- CBMSystemUnix(); + virtual int copy(std::string from, std::string to); + /** Creates a directory * Uses mkdir() POSIX call. Index: System.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** System.h 20 Sep 2006 08:22:21 -0000 1.7 --- System.h 24 Sep 2006 16:30:43 -0000 1.8 *************** *** 141,144 **** --- 141,152 ---- std::string localfile); + /** Copy a local file. + * Will uses cp on UNIX. + * \param from source file to be copied + * \param to destination of the file + * \return 1 if ok. + */ + virtual int copy(std::string from, std::string to) = 0; + /** Creates a directory * \param dir directory name |
|
From: Frederic T. <xf...@us...> - 2006-09-24 16:30:10
|
Update of /cvsroot/compbench/CompBenchmarks++/Benchmark In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21538 Modified Files: Benchmark.cpp Benchmark.h Log Message: Fetch() added. Index: Benchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Benchmark.h 19 Sep 2006 17:09:35 -0000 1.4 --- Benchmark.h 24 Sep 2006 16:30:00 -0000 1.5 *************** *** 337,340 **** --- 337,349 ---- virtual int Install(int _force = 0); + /** Copy a local archive. + * Copy package to directory defined by CBMSystem::Download. It'll be ready + * to be extracted using Install(). + * \param _source the archive file + * \return 1 if ok. May changes status. + * \sa status + * \sa extract */ + virtual int Fetch(char *_source); + /** Uninstall package. * Uses uninstall(). Overloading is unadvised. Index: Benchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Benchmark.cpp 19 Sep 2006 15:39:16 -0000 1.7 --- Benchmark.cpp 24 Sep 2006 16:30:00 -0000 1.8 *************** *** 454,457 **** --- 454,485 ---- } + int CBMBenchmark::Fetch(char *_source) + { + std::string dest = localPackageAbsoluteName(); + std::string source = _source; + std::string expected_md5; + std::string md5; + + if (getStatus()>=Downloaded) { + return(1); + } + + if (dest!=source) { + cbmSystem->copy(source, dest); + } + + if (cbmSystem->fileExists(dest)) { + expected_md5=expectedMD5(); + md5=system->md5File(dest); + + if (expected_md5==md5) { + storeStatus(Downloaded); + return(1); + } + } + + return(0); + } + int CBMBenchmark::Uninstall(void) { |