compbench-devel Mailing List for CompBenchmarks (Page 11)
Brought to you by:
xfred
Menu
▾
▴
compbench-devel
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(48) |
Oct
(51) |
Nov
(66) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(242) |
Feb
(56) |
Mar
(95) |
Apr
(120) |
May
(127) |
Jun
(32) |
Jul
(10) |
Aug
(55) |
Sep
(114) |
Oct
(3) |
Nov
|
Dec
|
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:39:37
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv28248 Modified Files: compbenchmarks-core.pod Log Message: Minor changes. Index: compbenchmarks-core.pod =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core.pod,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** compbenchmarks-core.pod 27 Dec 2006 18:21:14 -0000 1.4 --- compbenchmarks-core.pod 23 May 2007 15:39:34 -0000 1.5 *************** *** 1,9 **** =head1 NAME ! compbenchmarks 0.4.1 - Compilers' benchmarking environment =head1 SYNOPSIS ! compbenchmarks --help Show embedded help. --- 1,10 ---- =head1 NAME ! compbenchmarks-core 0.5.0 - Compilers' benchmarking environment =head1 SYNOPSIS ! QUERYING : ! compbenchmarks [COMMAND] Show embedded help. |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:38:05
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27460 Modified Files: Makefile.am Log Message: Minor changes (comment). Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.am 1 May 2007 19:39:11 -0000 1.18 --- Makefile.am 23 May 2007 15:37:59 -0000 1.19 *************** *** 8,12 **** ! SUBDIRS = libcompbenchmarks SupportedBenchmarks CBM-PI bin_PROGRAMS = compbenchmarks-core --- 8,12 ---- ! SUBDIRS = libcompbenchmarks SupportedBenchmarks CBM-PI # Qt-4 bin_PROGRAMS = compbenchmarks-core |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:37:16
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27423 Modified Files: config.guess config.sub missing Log Message: Various changes. Index: config.guess =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/config.guess,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.guess 8 Sep 2006 17:04:13 -0000 1.1.1.1 --- config.guess 23 May 2007 15:37:13 -0000 1.2 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2006-02-23' # This file is free software; you can redistribute it and/or modify it --- 2,9 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it *************** *** 161,164 **** --- 162,166 ---- sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac *************** *** 211,215 **** exit ;; macppc:MirBSD:*:*) ! echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) --- 213,217 ---- exit ;; macppc:MirBSD:*:*) ! echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) *************** *** 771,774 **** --- 773,778 ---- pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *************** *** 778,785 **** echo ${UNAME_MACHINE}-pc-cygwin exit ;; ! i*:MINGW*:*) ! echo ${UNAME_MACHINE}-pc-mingw32 ! exit ;; ! i*:MSYS_NT-*:*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; --- 782,786 ---- echo ${UNAME_MACHINE}-pc-cygwin exit ;; ! *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; *************** *** 791,800 **** echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! x86:Interix*:[345]*) ! echo i586-pc-interix${UNAME_RELEASE} ! exit ;; ! EM64T:Interix*:[345]*) ! echo x86_64-unknown-interix${UNAME_RELEASE} ! exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks --- 792,804 ---- echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! *:Interix*:[3456]*) ! case ${UNAME_MACHINE} in ! x86) ! echo i586-pc-interix${UNAME_RELEASE} ! exit ;; ! EM64T | authenticamd) ! echo x86_64-unknown-interix${UNAME_RELEASE} ! exit ;; ! esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks *************** *** 832,835 **** --- 836,842 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu *************** *** 948,951 **** --- 955,961 ---- echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so *************** *** 990,994 **** # endif #else ! #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else --- 1000,1004 ---- # endif #else ! #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else *************** *** 1206,1209 **** --- 1216,1228 ---- echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} Index: config.sub =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/config.sub,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config.sub 8 Sep 2006 17:04:14 -0000 1.1.1.1 --- config.sub 23 May 2007 15:37:13 -0000 1.2 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2006-02-23' # This file is (in principle) common to ALL GNU software. --- 2,9 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, ! # Inc. ! timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. *************** *** 241,253 **** | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 242,255 ---- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ ! | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ ! | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 275,293 **** | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. --- 277,293 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | score \ ! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ! | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ! | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ ! | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. *************** *** 319,323 **** | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ --- 319,323 ---- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ *************** *** 325,334 **** | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ --- 325,334 ---- | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ ! | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ *************** *** 359,367 **** | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ --- 359,367 ---- | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ *************** *** 369,379 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. --- 369,377 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. *************** *** 913,916 **** --- 911,918 ---- basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei *************** *** 924,927 **** --- 926,932 ---- os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown *************** *** 1129,1133 **** basic_machine=sh-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; --- 1134,1138 ---- basic_machine=sh-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; *************** *** 1218,1222 **** | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1223,1227 ---- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1370,1373 **** --- 1375,1384 ---- case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 *************** *** 1379,1385 **** os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) --- 1390,1396 ---- os=-aout ;; ! c4x-* | tic4x-*) ! os=-coff ! ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1407,1410 **** --- 1418,1424 ---- os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf Index: missing =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/missing,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** missing 8 Sep 2006 17:04:28 -0000 1.1.1.1 --- missing 23 May 2007 15:37:13 -0000 1.2 *************** *** 1,6 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc. ! # Franc,ois Pinard <pi...@ir...>, 1996. # This program is free software; you can redistribute it and/or modify --- 1,10 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! ! scriptversion=2006-05-10.23 ! ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ! # Free Software Foundation, Inc. ! # Originally by Fran,cois Pinard <pi...@ir...>, 1996. # This program is free software; you can redistribute it and/or modify *************** *** 16,21 **** # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. if test $# -eq 0; then --- 20,30 ---- # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software ! # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ! # 02110-1301, USA. ! ! # As a special exception to the GNU General Public License, if you ! # distribute this file as part of a program that contains a ! # configuration script generated by Autoconf, you may include it under ! # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then *************** *** 24,30 **** fi # In the cases where this matters, `missing' is being run in the # srcdir already. ! if test -f configure.in; then configure_ac=configure.ac else --- 33,43 ---- fi + run=: + sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' + sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + # In the cases where this matters, `missing' is being run in the # srcdir already. ! if test -f configure.ac; then configure_ac=configure.ac else *************** *** 32,36 **** fi ! case "$1" in -h|--h|--he|--hel|--help) --- 45,66 ---- fi ! msg="missing on your system" ! ! case $1 in ! --run) ! # Try to run requested program, and just exit if it succeeds. ! run= ! shift ! "$@" && exit 0 ! # Exit code 63 means version mismatch. This often happens ! # when the user try to use an ancient version of a tool on ! # a file that requires a minimum version. In this case we ! # we should proceed has if the program had been absent, or ! # if --run hadn't been passed. ! if test $? = 63; then ! run=: ! msg="probably too old" ! fi ! ;; -h|--h|--he|--hel|--help) *************** *** 44,47 **** --- 74,78 ---- -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: *************** *** 49,62 **** autoconf touch file \`configure' autoheader touch file \`config.h.in' automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file ! yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing - GNU libit 0.0" ;; --- 80,100 ---- autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file ! tar try tar, gnutar, gtar, then tar without non-portable flags ! yacc create \`y.tab.[ch]', if possible, from existing .[ch] ! ! Send bug reports to <bug...@gn...>." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing $scriptversion (GNU Automake)" ! exit $? ;; *************** *** 67,74 **** ;; aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." --- 105,147 ---- ;; + esac + + # Now exit if we have it, but it failed. Also exit now if we + # don't have it and --version was passed (most likely to detect + # the program). + case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; + esac + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case $1 in aclocal*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if ! you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." *************** *** 78,83 **** autoconf) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." --- 151,156 ---- autoconf) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if ! you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." *************** *** 87,99 **** autoheader) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` test -z "$files" && files="config.h" touch_files= for f in $files; do ! case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; --- 160,172 ---- autoheader) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if ! you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do ! case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *************** *** 106,111 **** automake*) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." --- 179,184 ---- automake*) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." *************** *** 115,135 **** ;; bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi --- 188,231 ---- ;; + autom4te) + echo 1>&2 "\ + WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ ! WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi *************** *** 137,144 **** esac fi ! if [ ! -f y.tab.h ]; then echo >y.tab.h fi ! if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi --- 233,240 ---- esac fi ! if test ! -f y.tab.h; then echo >y.tab.h fi ! if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi *************** *** 147,161 **** lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if [ $# -ne 1 ]; then eval LASTARG="\${$#}" ! case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi --- 243,257 ---- lex|flex) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c ! if test $# -ne 1; then eval LASTARG="\${$#}" ! case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` ! if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi *************** *** 163,174 **** esac fi ! if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; makeinfo) echo 1>&2 "\ ! WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious --- 259,288 ---- esac fi ! if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; + help2man) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) echo 1>&2 "\ ! WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious *************** *** 176,193 **** DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` fi touch $file ;; *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and you do not seem to have it handy on your ! system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequirements for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." --- 290,355 ---- DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." ! # The file to touch is that specified with -o ... ! file=`echo "$*" | sed -n "$sed_output"` ! test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n ' ! /^@setfilename/{ ! s/.* \([^ ]*\) *$/\1/ ! p ! q ! }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ + WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ ! WARNING: \`$1' is needed, and is $msg. ! You might have modified some files without having the proper tools for further handling them. Check the \`README' file, ! it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." *************** *** 197,198 **** --- 359,367 ---- exit 0 + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" + # time-stamp-end: "$" + # End: |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:36:48
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27070 Modified Files: ChangeLog configure.in Log Message: Updates for 0.5.0-ALPHA1. Index: ChangeLog =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog 21 Dec 2006 18:38:36 -0000 1.21 --- ChangeLog 23 May 2007 15:36:42 -0000 1.22 *************** *** 1,2 **** --- 1,17 ---- + 0.5.0-ALPHA1 + * Testsuite added. + * Many fixes in benchpplinux and nbench support interfaces. + * Build method improved, code has been reorganised and + API made more clear. + * New native Perl API binding to libcompbenchmarks. + * linpackc support revisited (new package is used). + * Time-out used on download operations. + * Measure compilation and execution times with a precision of + about millisecond. + * Many changes in compbenchmarks-core command-line options. + * Configuration is now XML based, and much more flexible. + * XML knowledge base for compilers and options added. + * Updated documentation. + 0.4.0 * benchpplinux support improved (25 more benchmarks). Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** configure.in 18 Apr 2007 16:49:19 -0000 1.29 --- configure.in 23 May 2007 15:36:42 -0000 1.30 *************** *** 15,19 **** AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0) AM_CONFIG_HEADER(libcompbenchmarks/config.h) --- 15,19 ---- AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0-ALPHA1) AM_CONFIG_HEADER(libcompbenchmarks/config.h) *************** *** 231,235 **** # Checks for header files. AC_HEADER_STDC ! AC_CHECK_HEADERS(string time.h stat.h types.h dirent.h getopt.h dlfcn.h ctype.h) # Checks for typedefs, structures, and compiler characteristics. --- 231,235 ---- # Checks for header files. AC_HEADER_STDC ! AC_CHECK_HEADERS(string time.h stat.h types.h dirent.h getopt.h dlfcn.h ctype.h pthread.h) # Checks for typedefs, structures, and compiler characteristics. *************** *** 313,317 **** CBM-PI/t/Makefile CBM-PI/Makefile - tools/Makefile Makefile) --- 313,316 ---- |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:35:44
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26684 Modified Files: 00-CBMSystem-public.pl Log Message: Expected version : 0.5.0-ALPHA1 Index: 00-CBMSystem-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** 00-CBMSystem-public.pl 22 Apr 2007 16:04:52 -0000 1.7 --- 00-CBMSystem-public.pl 23 May 2007 15:35:41 -0000 1.8 *************** *** 164,168 **** test_getLastCommand(); test_getLastCommandOutput(); ! ok($sys->Version() eq "0.5.0"); $sys->done(); --- 164,168 ---- test_getLastCommand(); test_getLastCommandOutput(); ! ok($sys->Version() eq "0.5.0-ALPHA1"); $sys->done(); |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:34:18
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26270 Modified Files: 06-CBM-LibUI.pl Log Message: Few minor changes (get obsoleted BTW). Index: 06-CBM-LibUI.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/06-CBM-LibUI.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** 06-CBM-LibUI.pl 15 Feb 2007 19:12:33 -0000 1.2 --- 06-CBM-LibUI.pl 23 May 2007 15:34:15 -0000 1.3 *************** *** 67,71 **** foreach(@XPROGRAMS) { ok(defined($progs{$_})); ! ok(-x $progs{$_}); $used{$progs{$_}}++; } --- 67,71 ---- foreach(@XPROGRAMS) { ok(defined($progs{$_})); ! ok(-x $progs{$_}, "$_ available"); $used{$progs{$_}}++; } *************** *** 78,83 **** } ! sub test_libui_plan { ! my $plan = $libui->Plan(); $plan->reset(); --- 78,83 ---- } ! sub test_libui_plan_batch { ! my $plan = $libui->PlanBatch("test"); $plan->reset(); *************** *** 103,105 **** test_libui(); test_libui_programs(); ! test_libui_plan(); --- 103,105 ---- test_libui(); test_libui_programs(); ! test_libui_plan_batch(); |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:34:00
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25907 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Log Message: API changed. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CBM.pm 15 Feb 2007 19:03:24 -0000 1.19 --- CBM.pm 23 May 2007 15:33:56 -0000 1.20 *************** *** 51,54 **** --- 51,56 ---- *setVerbosity = *CBMc::setVerbosity; + *descriptionIncludePathAdd = *CBMc::descriptionIncludePathAdd; + *descriptionFullIncludeName = *CBMc::descriptionFullIncludeName; *Init = *CBMc::Init; *stringref = *CBMc::stringref; *************** *** 182,186 **** %ITERATORS = (); *Package = *CBMc::Benchmark_Package; - *setPlan = *CBMc::Benchmark_setPlan; *Name = *CBMc::Benchmark_Name; *Comments = *CBMc::Benchmark_Comments; --- 184,187 ---- *************** *** 471,474 **** --- 472,476 ---- *md5 = *CBMc::System_md5; *md5File = *CBMc::System_md5File; + *downloadNow = *CBMc::System_downloadNow; *download = *CBMc::System_download; *copy = *CBMc::System_copy; *************** *** 479,483 **** *fileExists = *CBMc::System_fileExists; *fileWrite = *CBMc::System_fileWrite; ! *Time = *CBMc::System_Time; *done = *CBMc::System_done; *getLastCommand = *CBMc::System_getLastCommand; --- 481,487 ---- *fileExists = *CBMc::System_fileExists; *fileWrite = *CBMc::System_fileWrite; ! *fileSize = *CBMc::System_fileSize; ! *startTimer = *CBMc::System_startTimer; ! *endTimer = *CBMc::System_endTimer; *done = *CBMc::System_done; *getLastCommand = *CBMc::System_getLastCommand; *************** *** 496,499 **** --- 500,546 ---- + ############# Class : CBM::CompilerOptionLogicVar ############## + + package CBM::CompilerOptionLogicVar; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + *swig_id_get = *CBMc::CompilerOptionLogicVar_id_get; + *swig_id_set = *CBMc::CompilerOptionLogicVar_id_set; + *swig_value_get = *CBMc::CompilerOptionLogicVar_value_get; + *swig_value_set = *CBMc::CompilerOptionLogicVar_value_set; + *swig_lastWriter_get = *CBMc::CompilerOptionLogicVar_lastWriter_get; + *swig_lastWriter_set = *CBMc::CompilerOptionLogicVar_lastWriter_set; + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerOptionLogicVar(@_); + bless $self, $pkg if defined($self); + } + + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerOptionLogicVar($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + ############# Class : CBM::Compiler ############## *************** *** 503,512 **** %OWNER = (); %ITERATORS = (); - *setPlan = *CBMc::Compiler_setPlan; *compiler = *CBMc::Compiler_compiler; *Name = *CBMc::Compiler_Name; *Version = *CBMc::Compiler_Version; *Binary = *CBMc::Compiler_Binary; *Language = *CBMc::Compiler_Language; sub DESTROY { return unless $_[0]->isa('HASH'); --- 550,569 ---- %OWNER = (); %ITERATORS = (); *compiler = *CBMc::Compiler_compiler; *Name = *CBMc::Compiler_Name; *Version = *CBMc::Compiler_Version; + *VanillaVersion = *CBMc::Compiler_VanillaVersion; *Binary = *CBMc::Compiler_Binary; *Language = *CBMc::Compiler_Language; + *relativeDescriptionDirectory = *CBMc::Compiler_relativeDescriptionDirectory; + *OptionDescriptions = *CBMc::Compiler_OptionDescriptions; + *colVarGet = *CBMc::Compiler_colVarGet; + *colVarSet = *CBMc::Compiler_colVarSet; + *colVarWriter = *CBMc::Compiler_colVarWriter; + *colOptionHas = *CBMc::Compiler_colOptionHas; + *analyzeOptions = *CBMc::Compiler_analyzeOptions; + *shortHelpOptions = *CBMc::Compiler_shortHelpOptions; + *supportedVersionNumber = *CBMc::Compiler_supportedVersionNumber; + *supportedVersion = *CBMc::Compiler_supportedVersion; sub DESTROY { return unless $_[0]->isa('HASH'); *************** *** 571,574 **** --- 628,815 ---- + ############# Class : CBM::CompilerVersion ############## + + package CBM::CompilerVersion; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerVersion(@_); + bless $self, $pkg if defined($self); + } + + *AsInteger = *CBMc::CompilerVersion_AsInteger; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerVersion($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + + ############# Class : CBM::CompilerOptionDescription ############## + + package CBM::CompilerOptionDescription; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerOptionDescription(@_); + bless $self, $pkg if defined($self); + } + + *Id = *CBMc::CompilerOptionDescription_Id; + *ShortDescription = *CBMc::CompilerOptionDescription_ShortDescription; + *EditorDescription = *CBMc::CompilerOptionDescription_EditorDescription; + *Option = *CBMc::CompilerOptionDescription_Option; + *CompilationTwoPassNeeded = *CBMc::CompilerOptionDescription_CompilationTwoPassNeeded; + *CompilationPass = *CBMc::CompilerOptionDescription_CompilationPass; + *CompilationFirstPassOption = *CBMc::CompilerOptionDescription_CompilationFirstPassOption; + *Use = *CBMc::CompilerOptionDescription_Use; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerOptionDescription($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + + ############# Class : CBM::CompilerOptionDescriptions ############## + + package CBM::CompilerOptionDescriptions; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_CompilerOptionDescriptions(@_); + bless $self, $pkg if defined($self); + } + + *DescriptionFile = *CBMc::CompilerOptionDescriptions_DescriptionFile; + *DescriptionNumber = *CBMc::CompilerOptionDescriptions_DescriptionNumber; + *Description = *CBMc::CompilerOptionDescriptions_Description; + *DescriptionLitteral = *CBMc::CompilerOptionDescriptions_DescriptionLitteral; + *Compiler = *CBMc::CompilerOptionDescriptions_Compiler; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_CompilerOptionDescriptions($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + + ############# Class : CBM::PlanBatch ############## + + package CBM::PlanBatch; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_PlanBatch(@_); + bless $self, $pkg if defined($self); + } + + *Id = *CBMc::PlanBatch_Id; + *setId = *CBMc::PlanBatch_setId; + *addOptions = *CBMc::PlanBatch_addOptions; + *add = *CBMc::PlanBatch_add; + *remove = *CBMc::PlanBatch_remove; + *compilerNumber = *CBMc::PlanBatch_compilerNumber; + *compilerOptionNumber = *CBMc::PlanBatch_compilerOptionNumber; + *benchmarkNumber = *CBMc::PlanBatch_benchmarkNumber; + *getCompiler = *CBMc::PlanBatch_getCompiler; + *getCompilerOptions = *CBMc::PlanBatch_getCompilerOptions; + *getBenchmark = *CBMc::PlanBatch_getBenchmark; + *totalIterations = *CBMc::PlanBatch_totalIterations; + *currentIteration = *CBMc::PlanBatch_currentIteration; + *currentCompiler = *CBMc::PlanBatch_currentCompiler; + *currentCompilerOptions = *CBMc::PlanBatch_currentCompilerOptions; + *currentBenchmark = *CBMc::PlanBatch_currentBenchmark; + *nextIteration = *CBMc::PlanBatch_nextIteration; + *stop = *CBMc::PlanBatch_stop; + *XML = *CBMc::PlanBatch_XML; + *reset = *CBMc::PlanBatch_reset; + *store = *CBMc::PlanBatch_store; + *restore = *CBMc::PlanBatch_restore; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_PlanBatch($self); + delete $OWNER{$self}; + } + } + + sub DISOWN { + my $self = shift; + my $ptr = tied(%$self); + delete $OWNER{$ptr}; + } + + sub ACQUIRE { + my $self = shift; + my $ptr = tied(%$self); + $OWNER{$ptr} = 1; + } + + ############# Class : CBM::Plan ############## *************** *** 584,595 **** } ! *add = *CBMc::Plan_add; ! *remove = *CBMc::Plan_remove; ! *compilerNumber = *CBMc::Plan_compilerNumber; ! *compilerOptionNumber = *CBMc::Plan_compilerOptionNumber; ! *benchmarkNumber = *CBMc::Plan_benchmarkNumber; ! *getCompiler = *CBMc::Plan_getCompiler; ! *getCompilerOptions = *CBMc::Plan_getCompilerOptions; ! *getBenchmark = *CBMc::Plan_getBenchmark; *totalIterations = *CBMc::Plan_totalIterations; *currentIteration = *CBMc::Plan_currentIteration; --- 825,832 ---- } ! *addBatch = *CBMc::Plan_addBatch; ! *removeBatch = *CBMc::Plan_removeBatch; ! *batchNumber = *CBMc::Plan_batchNumber; ! *getBatch = *CBMc::Plan_getBatch; *totalIterations = *CBMc::Plan_totalIterations; *currentIteration = *CBMc::Plan_currentIteration; *************** *** 646,649 **** --- 883,889 ---- $cbmSystem= \%__cbmSystem_hash; bless $cbmSystem, CBM::System; + *H_CBMCOMPILER_VERSION = *CBMc::H_CBMCOMPILER_VERSION; + *descriptionIncludePaths = *CBMc::descriptionIncludePaths; + *H_CBM_PLANBATCH = *CBMc::H_CBM_PLANBATCH; *H_CBM_PLAN = *CBMc::H_CBM_PLAN; 1; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CBM_wrap.cxx 15 Feb 2007 19:03:24 -0000 1.19 --- CBM_wrap.cxx 23 May 2007 15:33:56 -0000 1.20 *************** *** 1430,1452 **** #define SWIGTYPE_p_CBM__BenchmarkCached swig_types[1] #define SWIGTYPE_p_CBM__Compiler swig_types[2] ! #define SWIGTYPE_p_CBM__CompilerSelector swig_types[3] ! #define SWIGTYPE_p_CBM__Config swig_types[4] ! #define SWIGTYPE_p_CBM__Package swig_types[5] ! #define SWIGTYPE_p_CBM__Plan swig_types[6] ! #define SWIGTYPE_p_CBM__Result swig_types[7] ! #define SWIGTYPE_p_CBM__System swig_types[8] ! #define SWIGTYPE_p_CBM__XMLAttribute swig_types[9] ! #define SWIGTYPE_p_CBM__XMLNode swig_types[10] [...4267 lines suppressed...] + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerOptionLogicVar, (void*) "CBM::CompilerOptionLogicVar"); SWIG_TypeClientData(SWIGTYPE_p_CBM__Compiler, (void*) "CBM::Compiler"); SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerSelector, (void*) "CBM::CompilerSelector"); /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_CBMCOMPILER_VERSION", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerVersion, (void*) "CBM::CompilerVersion"); + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerOptionDescription, (void*) "CBM::CompilerOptionDescription"); + SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerOptionDescriptions, (void*) "CBM::CompilerOptionDescriptions"); + /*@SWIG:%set_constant@*/ do { + SV *sv = get_sv((char*) SWIG_prefix "H_CBM_PLANBATCH", TRUE | 0x2); + sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); + SvREADONLY_on(sv); + } while(0) /*@SWIG@*/; + SWIG_TypeClientData(SWIGTYPE_p_CBM__PlanBatch, (void*) "CBM::PlanBatch"); + /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "H_CBM_PLAN", TRUE | 0x2); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(1))); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CBM.i 17 Apr 2007 17:56:17 -0000 1.12 --- CBM.i 23 May 2007 15:33:56 -0000 1.13 *************** *** 15,18 **** --- 15,19 ---- #include "Base/Config.h" #include "Base/Result.h" + #include "Plan/Plan-Batch.h" #include "Plan/Plan.h" using namespace CBM; *************** *** 30,33 **** --- 31,35 ---- %include "Compiler/Compiler-Version.h" %include "Compiler/Compiler-Option-Description.h" + %include "Plan/Plan-Batch.h" %include "Plan/Plan.h" %include "Glue.h" |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:33:27
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25881 Modified Files: Makefile.am Log Message: Plan-Batch.h added. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.am 1 May 2007 14:50:41 -0000 1.17 --- Makefile.am 23 May 2007 15:33:24 -0000 1.18 *************** *** 26,29 **** --- 26,30 ---- $(top_srcdir)/libcompbenchmarks/Base/Config.h \ $(top_srcdir)/libcompbenchmarks/Base/Result.h \ + $(top_srcdir)/libcompbenchmarks/Plan/Plan-Batch.h \ $(top_srcdir)/libcompbenchmarks/Plan/Plan.h \ $(top_srcdir)/CBM-PI/Glue.h |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:32:38
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25494 Modified Files: config.h.in Log Message: pthread used. Index: config.h.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/config.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config.h.in 30 Jan 2007 20:02:55 -0000 1.2 --- config.h.in 23 May 2007 15:32:36 -0000 1.3 *************** *** 94,97 **** --- 94,100 ---- #undef HAVE_MEMORY_H + /* Define to 1 if you have the <pthread.h> header file. */ + #undef HAVE_PTHREAD_H + /* Define to 1 if you have the <stat.h> header file. */ #undef HAVE_STAT_H |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:31:51
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl/CBM In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25049 Modified Files: LibUI.pm Log Message: Few minor changes (get obsoleted BTW). Index: LibUI.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl/CBM/LibUI.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LibUI.pm 15 Feb 2007 19:01:36 -0000 1.2 --- LibUI.pm 23 May 2007 15:31:09 -0000 1.3 *************** *** 19,27 **** our %DEFAULT_COMPILERS = ('C' => ! ['/usr/bin/gccx', '/usr/bin/tcc', 'gcc-2.95', 'gcc-2.96', 'gcc-3.1', 'gcc-3.2', 'gcc-3.3', 'gcc-3.4', 'gcc-4.0', 'gcc-4.1', '/usr/local/bin/gcc', '/usr/local/bin/tcc'], --- 19,28 ---- our %DEFAULT_COMPILERS = ('C' => ! ['/usr/bin/gcc', '/usr/bin/tcc', 'gcc-2.95', 'gcc-2.96', 'gcc-3.1', 'gcc-3.2', 'gcc-3.3', 'gcc-3.4', 'gcc-4.0', 'gcc-4.1', + 'gcc-4.2', '/usr/local/bin/gcc', '/usr/local/bin/tcc'], *************** *** 31,34 **** --- 32,36 ---- 'g++-3.1', 'g++-3.2', 'g++-3.3', 'g++-3.4', 'g++-4.0', 'g++-4.1', + 'g++-4.2', '/usr/local/bin/g++']); $VERSION="0.5.0"; *************** *** 138,145 **** } ! sub Plan { my $self = shift; ! return($sys->Plan()); } --- 140,148 ---- } ! sub PlanBatch { my $self = shift; + my $id = shift; ! return($sys->PlanBatch($id)); } |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:29:49
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24288 Modified Files: Plan.cpp Plan.h Log Message: addBatch(...) interface modified. Index: Plan.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Plan.h 17 May 2007 14:33:04 -0000 1.6 --- Plan.h 23 May 2007 15:29:46 -0000 1.7 *************** *** 53,57 **** Plan(); ! virtual CBM_PB *addBatch(std::string _id); virtual void removeBatch(CBM_PB *_ps); virtual void removeBatch(std::string _id); --- 53,57 ---- Plan(); ! virtual CBM_PB *addBatch(CBM_PB *_ps); virtual void removeBatch(CBM_PB *_ps); virtual void removeBatch(std::string _id); Index: Plan.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Plan.cpp 17 May 2007 14:33:04 -0000 1.9 --- Plan.cpp 23 May 2007 15:29:46 -0000 1.10 *************** *** 68,78 **** } ! CBM::PlanBatch *Plan::addBatch(std::string _id) { ! PlanBatch *result = new PlanBatch(_id); ! ! planBatch.push_back(result); stop(); ! return(result); } --- 68,76 ---- } ! CBM::PlanBatch *Plan::addBatch(CBM::PlanBatch *_batch) { ! planBatch.push_back(_batch); stop(); ! return(_batch); } |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:28:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/3.1.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23920 Modified Files: description.xml Log Message: Fix on -fssa-dce option (value). Index: description.xml =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/3.1.x/description.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** description.xml 17 Apr 2007 19:25:52 -0000 1.1 --- description.xml 23 May 2007 15:28:51 -0000 1.2 *************** *** 100,104 **** <option id="ssa-dce"> ! <value>fssa-dce</value> <short-description>Agressive dead code elimination</short-description> <editor-description> --- 100,104 ---- <option id="ssa-dce"> ! <value>-fssa-dce</value> <short-description>Agressive dead code elimination</short-description> <editor-description> |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:28:09
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23555 Modified Files: Result.h Log Message: Typo in comments. Index: Result.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Base/Result.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Result.h 5 Feb 2007 20:01:59 -0000 1.1 --- Result.h 23 May 2007 15:28:04 -0000 1.2 *************** *** 12,16 **** namespace CBM { ! /** \brief Class for storing and managing results */ class Result { --- 12,16 ---- namespace CBM { ! /** \brief Class for storing and managing result */ class Result { |
|
From: Frederic T. <xf...@us...> - 2007-05-23 15:26:57
|
Update of /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23158 Modified Files: Benchmark-BENCHPPLINUX.cpp Log Message: Fix a possible issue on install (force temporary directory removal). Index: Benchmark-BENCHPPLINUX.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Benchmark-BENCHPPLINUX.cpp 7 May 2007 20:06:38 -0000 1.11 --- Benchmark-BENCHPPLINUX.cpp 23 May 2007 15:26:53 -0000 1.12 *************** *** 81,84 **** --- 81,86 ---- cmd+=system->Directory(CBM::System::Extract); cmd+=" && "; + cmd+=CBM_PROG_RM; + cmd+=" -rf bench++-linux-tmp && "; cmd+=CBM_PROG_MKDIR; cmd+=" bench++-linux-tmp && "; |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:29:22
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16496 Modified Files: compbenchmarks-ui-qt4.pro Log Message: Many new added files. Index: compbenchmarks-ui-qt4.pro =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** compbenchmarks-ui-qt4.pro 17 May 2007 22:38:18 -0000 1.4 --- compbenchmarks-ui-qt4.pro 22 May 2007 17:29:12 -0000 1.5 *************** *** 12,16 **** INCLUDEPATH += . ../libcompbenchmarks ../testing/libcompbenchmarks ! base_sources = Basic/OptionHolder Basic/BenchmarkHolder Basic/PlanBatchHolder package_sources = Package/PackageHolder Package/PackageInfo Package/PackageList Package/PackageManager --- 12,18 ---- INCLUDEPATH += . ../libcompbenchmarks ../testing/libcompbenchmarks ! base_sources = Basic/OptionHolder Basic/OptionSetHolder Basic/BenchmarkHolder Basic/PlanBatchHolder Basic/Info ! ! option_sources = CompilerOption/CompilerOptionInfo package_sources = Package/PackageHolder Package/PackageInfo Package/PackageList Package/PackageManager *************** *** 20,24 **** plan_sources = Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager ! all_sources = $$base_sources $$package_sources $$compiler_sources $$plan_sources Status/Status main defineReplace(headers) { --- 22,26 ---- plan_sources = Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager ! all_sources = $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status main defineReplace(headers) { |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:29:02
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16138 Modified Files: PlanAvailableOption.cpp PlanAvailableOption.h Log Message: Option information is available. Index: PlanAvailableOption.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanAvailableOption.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlanAvailableOption.h 17 May 2007 22:36:11 -0000 1.1 --- PlanAvailableOption.h 22 May 2007 17:28:52 -0000 1.2 *************** *** 3,6 **** --- 3,8 ---- #include <QListWidget> + #include <QContextMenuEvent> + #include <QMenu> #include <Basic/OptionHolder.h> *************** *** 8,11 **** --- 10,36 ---- namespace CQT { + class PlanAvailableOptionContextMenuEvent : public QContextMenuEvent + { + public: + PlanAvailableOptionContextMenuEvent(Reason reason, + const QPoint &globalPos); + + virtual ~PlanAvailableOptionContextMenuEvent(); + }; + + class PlanAvailableOptionContextMenu : public QMenu + { + Q_OBJECT + private: + CBM::CompilerOption *option; + protected slots: + void doOptionInfo(void); + + public: + PlanAvailableOptionContextMenu(class PlanAvailableOptionListItem *_item); + + virtual ~PlanAvailableOptionContextMenu(); + }; + class PlanAvailableOptionListItem : public QListWidgetItem, public OptionHolder *************** *** 22,26 **** private: protected: ! signals: void sigOptionsRefresh(CBM::Compiler *_compiler); --- 47,51 ---- private: protected: ! virtual void contextMenuEvent(QContextMenuEvent *event); signals: void sigOptionsRefresh(CBM::Compiler *_compiler); Index: PlanAvailableOption.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanAvailableOption.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlanAvailableOption.cpp 17 May 2007 22:36:11 -0000 1.1 --- PlanAvailableOption.cpp 22 May 2007 17:28:52 -0000 1.2 *************** *** 10,13 **** --- 10,43 ---- using namespace CQT; + PlanAvailableOptionContextMenuEvent::PlanAvailableOptionContextMenuEvent(Reason reason, + const QPoint &globalPos) + : QContextMenuEvent(reason, globalPos) + { + } + + PlanAvailableOptionContextMenuEvent::~PlanAvailableOptionContextMenuEvent() + { + } + + PlanAvailableOptionContextMenu::PlanAvailableOptionContextMenu(PlanAvailableOptionListItem *_item) + : QMenu("Option") + { + if (_item) { + option=_item->Option(); + addAction(QIcon(":/icons/tip.png"), tr("Informations"), + this, SLOT(doOptionInfo())); + } + } + + void PlanAvailableOptionContextMenu::doOptionInfo(void) + { + emit App->optionInfo(option); + } + + PlanAvailableOptionContextMenu::~PlanAvailableOptionContextMenu() + { + } + + PlanAvailableOptionListItem::PlanAvailableOptionListItem(CBM::CompilerOption *_option) : QListWidgetItem(_option->Option().c_str()), *************** *** 33,36 **** --- 63,74 ---- this, SLOT(doOptionsRefresh(CBM::Compiler*)), Qt::QueuedConnection); + + setContextMenuPolicy(Qt::DefaultContextMenu); + } + + void PlanAvailableOptionList::contextMenuEvent(QContextMenuEvent *event) + { + PlanAvailableOptionContextMenu m((PlanAvailableOptionListItem*)currentItem()); + m.exec(event->globalPos()); } |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:28:34
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Package In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16116 Modified Files: PackageInfo.cpp PackageInfo.h Log Message: Use Basic/Info.h Index: PackageInfo.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Package/PackageInfo.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PackageInfo.cpp 17 May 2007 22:36:45 -0000 1.2 --- PackageInfo.cpp 22 May 2007 17:28:28 -0000 1.3 *************** *** 4,49 **** using namespace CQT; - PackageInfoTab::PackageInfoTab(QWidget *parent) - : QWidget(parent) - { - lay=new QGridLayout; - - layIndex=0; - setLayout(lay); - } - - QLineEdit *PackageInfoTab::addInfo(std::string _label, - std::string _value) - { - QLabel *l; - QLineEdit *v; - - l=new QLabel(tr(_label.c_str())); - v=new QLineEdit(_value.c_str()); - v->setReadOnly(true); - lay->addWidget(l, layIndex, 0); - lay->addWidget(v, layIndex, 1); - layIndex++; - return(v); - } - - void PackageInfoTab::addSpace(void) - { - lay->setRowStretch(20,20); - } - - QGridLayout *PackageInfoTab::Layout(void) - { - return(lay); - } - - PackageInfoTab::~PackageInfoTab() - { - } - PackageInfo::PackageInfo(QWidget *parent) : QTabWidget(parent) { ! PackageInfoTab *main = new PackageInfoTab(); addTab(main, "General"); --- 4,11 ---- using namespace CQT; PackageInfo::PackageInfo(QWidget *parent) : QTabWidget(parent) { ! InfoTab *main = new InfoTab(); addTab(main, "General"); *************** *** 61,73 **** main->addSpace(); ! PackageInfoTab *comments = new PackageInfoTab(); comments->setToolTip(tr("Comments")); addTab(comments, "Comments"); ! packageComments = new QTextEdit(""); ! packageComments->setReadOnly(true); packageComments->setToolTip(tr("Comments and various informations about package")); - comments->Layout()->addWidget(packageComments, 0, 0); ! PackageInfoTab *meta = new PackageInfoTab(); meta->setToolTip(tr("Informations used or added by CompBenchmarks for selected package")); addTab(meta, "Meta-informations"); --- 23,34 ---- main->addSpace(); ! InfoTab *comments = new InfoTab(); comments->setToolTip(tr("Comments")); addTab(comments, "Comments"); ! ! packageComments = comments->addText(""); packageComments->setToolTip(tr("Comments and various informations about package")); ! InfoTab *meta = new InfoTab(); meta->setToolTip(tr("Informations used or added by CompBenchmarks for selected package")); addTab(meta, "Meta-informations"); *************** *** 82,86 **** meta->addSpace(); ! PackageInfoTab *links = new PackageInfoTab(); links->setToolTip(tr("Internet URL")); addTab(links, tr("Links")); --- 43,47 ---- meta->addSpace(); ! InfoTab *links = new InfoTab(); links->setToolTip(tr("Internet URL")); addTab(links, tr("Links")); Index: PackageInfo.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Package/PackageInfo.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PackageInfo.h 17 May 2007 22:36:45 -0000 1.2 --- PackageInfo.h 22 May 2007 17:28:28 -0000 1.3 *************** *** 2,36 **** #define H_CQT_PACKAGEINFO #include <Package/PackageHolder.h> #include <QListWidget> - #include <QGridLayout> #include <QLabel> - #include <QLineEdit> - #include <QTextEdit> #include <QTabWidget> namespace CQT { - class PackageInfoTab : public QWidget - { - Q_OBJECT - private: - QGridLayout *lay; - int layIndex; - - protected: - public: - PackageInfoTab(QWidget *parent = 0); - - virtual QLineEdit *addInfo(std::string _label, - std::string _value); - - virtual void addSpace(void); - - virtual QGridLayout *Layout(void); - - virtual ~PackageInfoTab(); - }; - class PackageInfo : public QTabWidget { --- 2,13 ---- #define H_CQT_PACKAGEINFO + #include <Basic/Info.h> #include <Package/PackageHolder.h> #include <QListWidget> #include <QLabel> #include <QTabWidget> namespace CQT { class PackageInfo : public QTabWidget { |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:28:16
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16095 Modified Files: CompilerInfo.cpp CompilerInfo.h CompilerList.cpp CompilerList.h Log Message: Use Basic/Info.h Index: CompilerInfo.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Compiler/CompilerInfo.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompilerInfo.cpp 17 May 2007 22:37:58 -0000 1.2 --- CompilerInfo.cpp 22 May 2007 17:28:13 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + #include <Basic/Info.h> + #include <Compiler/CompilerInfo.h> #include <Compiler/CompilerList.h> *************** *** 5,50 **** using namespace CQT; ! CompilerInfoTab::CompilerInfoTab(QWidget *parent) ! : QWidget(parent) ! { ! lay=new QGridLayout; ! ! layIndex=0; ! setLayout(lay); ! } ! ! QLineEdit *CompilerInfoTab::addInfo(std::string _label, ! std::string _value) ! { ! QLabel *l; ! QLineEdit *v; ! ! l=new QLabel(tr(_label.c_str())); ! v=new QLineEdit(_value.c_str()); ! v->setReadOnly(true); ! lay->addWidget(l, layIndex, 0); ! lay->addWidget(v, layIndex, 1); ! layIndex++; ! return(v); ! } ! ! void CompilerInfoTab::addSpace(void) ! { ! lay->setRowStretch(20,20); ! } ! ! QGridLayout *CompilerInfoTab::Layout(void) ! { ! return(lay); ! } ! ! CompilerInfoTab::~CompilerInfoTab() ! { ! } ! ! CompilerInfo::CompilerInfo(QWidget *parent) : QTabWidget(parent) { ! CompilerInfoTab *main = new CompilerInfoTab(); addTab(main, tr("General")); --- 7,14 ---- using namespace CQT; ! CompilerInfo::CompilerInfo(CBM::Compiler *_compiler, QWidget *parent) : QTabWidget(parent) { ! InfoTab *main = new InfoTab(); addTab(main, tr("General")); *************** *** 60,64 **** main->addSpace(); ! CompilerInfoTab *meta = new CompilerInfoTab(); addTab(meta, tr("Meta-informations")); setTabToolTip(1, tr("Internal CompBenchmarks informations")); --- 24,28 ---- main->addSpace(); ! InfoTab *meta = new InfoTab(); addTab(meta, tr("Meta-informations")); setTabToolTip(1, tr("Internal CompBenchmarks informations")); *************** *** 72,75 **** --- 36,57 ---- meta->addSpace(); + if (_compiler) + updateForCompiler(_compiler); + } + + void CompilerInfo::updateForCompiler(CBM::Compiler *C) + { + compilerName->setText(C->Name().c_str()); + compilerVersion->setText(C->Version().c_str()); + compilerLanguage->setText(C->Language().c_str()); + compilerBinary->setText(C->Binary().c_str()); + compilerDescriptionDirectory->setText(C->relativeDescriptionDirectory().c_str()); + + CBM::CompilerOptionDescriptions *OD = C->OptionDescriptions(); + + QString n; + n.setNum(OD->DescriptionNumber()); + compilerOptions->setText(n); + // delete(OD); } *************** *** 91,107 **** C=I->Compiler(); ! ! compilerName->setText(C->Name().c_str()); ! compilerVersion->setText(C->Version().c_str()); ! compilerLanguage->setText(C->Language().c_str()); ! compilerBinary->setText(C->Binary().c_str()); ! compilerDescriptionDirectory->setText(C->relativeDescriptionDirectory().c_str()); ! ! CBM::CompilerOptionDescriptions *OD = C->OptionDescriptions(); ! ! QString n; ! n.setNum(OD->DescriptionNumber()); ! compilerOptions->setText(n); ! // delete(OD); } --- 73,77 ---- C=I->Compiler(); ! updateForCompiler(C); } Index: CompilerList.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Compiler/CompilerList.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompilerList.h 17 May 2007 22:37:58 -0000 1.2 --- CompilerList.h 22 May 2007 17:28:13 -0000 1.3 *************** *** 28,31 **** --- 28,32 ---- protected slots: void compilerUnregister(void); + void compilerInfo(void); public: Index: CompilerList.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Compiler/CompilerList.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompilerList.cpp 17 May 2007 22:37:58 -0000 1.2 --- CompilerList.cpp 22 May 2007 17:28:13 -0000 1.3 *************** *** 27,33 **** App, SLOT(doCompilerRegisterManual())); ! if (_compiler) addAction(QIcon(":/icons/remove.png"), "Remove", this, SLOT(compilerUnregister())); addAction(QIcon(":/icons/find.png"), "Auto-detect", --- 27,37 ---- App, SLOT(doCompilerRegisterManual())); ! if (_compiler) { ! addAction(QIcon(":/icons/tip.png"), "Popup informations", ! this, SLOT(compilerInfo())); ! addAction(QIcon(":/icons/remove.png"), "Remove", this, SLOT(compilerUnregister())); + } addAction(QIcon(":/icons/find.png"), "Auto-detect", *************** *** 42,45 **** --- 46,54 ---- } + void CompilerListContextMenu::compilerInfo(void) + { + App->compilerInfo(Compiler()); + } + CompilerListContextMenu::~CompilerListContextMenu() { Index: CompilerInfo.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Compiler/CompilerInfo.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompilerInfo.h 17 May 2007 22:37:58 -0000 1.2 --- CompilerInfo.h 22 May 2007 17:28:13 -0000 1.3 *************** *** 2,35 **** #define H_CQT_COMPILERINFO - #include <Compiler/CompilerHolder.h> #include <QListWidget> - #include <QGridLayout> - #include <QLabel> - #include <QLineEdit> - #include <QTextEdit> #include <QTabWidget> ! namespace CQT { ! ! class CompilerInfoTab : public QWidget ! { ! Q_OBJECT ! private: ! QGridLayout *lay; ! int layIndex; ! ! protected: ! public: ! CompilerInfoTab(QWidget *parent = 0); ! ! virtual QLineEdit *addInfo(std::string _label, ! std::string _value); ! ! virtual void addSpace(void); ! virtual QGridLayout *Layout(void); ! ! virtual ~CompilerInfoTab(); ! }; class CompilerInfo : public QTabWidget { --- 2,11 ---- #define H_CQT_COMPILERINFO #include <QListWidget> #include <QTabWidget> ! #include <Compiler/Compiler.h> + namespace CQT { class CompilerInfo : public QTabWidget { *************** *** 45,48 **** --- 21,26 ---- protected: + virtual void updateForCompiler(CBM::Compiler *C); + protected slots: virtual void doSelectionChanged(QListWidgetItem *current, *************** *** 51,55 **** public: ! CompilerInfo(QWidget *parent = 0); virtual ~CompilerInfo(); }; --- 29,34 ---- public: ! CompilerInfo(CBM::Compiler *_compiler = 0, ! QWidget *parent = 0); virtual ~CompilerInfo(); }; |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:27:56
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/CompilerOption In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15743 Added Files: CompilerOptionInfo.cpp CompilerOptionInfo.h Log Message: First import. --- NEW FILE: CompilerOptionInfo.h --- #ifndef H_CQT_COMPILEROPTIONINFO #define H_CQT_COMPILEROPTIONINFO #include <QTabWidget> #include <Basic/Info.h> #include <Compiler/Compiler.h> // #include <Compiler/Compiler-Option.h> #include <Compiler/Compiler-Option-Description.h> namespace CQT { class CompilerOptionInfo : public QTabWidget { Q_OBJECT private: CBM::Compiler *compiler; CBM::CompilerOptionDescription *D; QLineEdit *compilerName; QLineEdit *optionString; QLineEdit *shortDescription; QTextEdit *editorDescription; QLineEdit *passCompilation; QLineEdit *passCompilationFirstOption; QLineEdit *compilerDescriptionDirectory; protected: virtual void updateForOption(std::string _option); protected slots: public: CompilerOptionInfo(std::string _option, QWidget *parent = 0); virtual ~CompilerOptionInfo(); }; } #endif --- NEW FILE: CompilerOptionInfo.cpp --- #include <Basic/Info.h> #include <main.h> #include <CompilerOption/CompilerOptionInfo.h> using namespace CQT; CompilerOptionInfo::CompilerOptionInfo(std::string _option, QWidget *parent) : QTabWidget(parent) { compiler=App->PlanCompilerSelected(); InfoTab *main = new InfoTab(); addTab(main, tr("Option")); setTabToolTip(0, tr("General information found about selected option")); if (!compiler) { QLabel *l = new QLabel(tr("No compiler selected")); main->Layout()->addWidget(l, 0, 0); return; } CBM::CompilerOptionDescriptions *OD = compiler->OptionDescriptions(); D=OD->DescriptionLitteral(_option); compilerName=main->addInfo(tr("Compiler :").toStdString(), ""); compilerName->setToolTip(tr("Compiler's name")); optionString=main->addInfo(tr("Option :").toStdString(), ""); optionString->setToolTip(tr("Argument for option")); shortDescription=main->addInfo(tr("Short description :").toStdString(), ""); shortDescription->setToolTip(tr("Option's short description")); editorDescription=main->addText(tr("Editor's description :").toStdString(), ""); editorDescription->setToolTip(tr("Description from compiler's editor")); main->addSpace(); if (D->CompilationTwoPassNeeded()) { InfoTab *mpass = new InfoTab(); addTab(mpass, tr("Multiple passes")); passCompilation=mpass->addInfo(tr("Pass number :").toStdString(), ""); passCompilation->setToolTip(tr("If option implies or is implied multiple compilations, shows which compilation number is associated to option")); if (D->CompilationPass()==2) { passCompilationFirstOption=mpass->addInfo(tr("First pass option :").toStdString(), ""); passCompilationFirstOption->setToolTip(tr("Compilation option needed in first pass")); } mpass->addSpace(); } InfoTab *meta = new InfoTab(); addTab(meta, tr("Meta-information")); setTabToolTip(1, tr("Informations from CompBenchmarks knowledge-base for selected compiler")); compilerDescriptionDirectory=meta->addInfo(tr("Nearest compatible branch :").toStdString(), ""); meta->addSpace(); updateForOption(_option); } void CompilerOptionInfo::updateForOption(std::string _option) { compilerName->setText(compiler->Name().c_str()); compilerDescriptionDirectory->setText(compiler->relativeDescriptionDirectory().c_str()); if (D) { optionString->setText(_option.c_str()); shortDescription->setText(D->ShortDescription().c_str()); editorDescription->setText(D->EditorDescription().c_str()); if (D->CompilationTwoPassNeeded()) { QString n; n.setNum(D->CompilationPass()); passCompilation->setText(n); if (D->CompilationPass()==2) { passCompilationFirstOption->setText(compiler->OptionDescriptions()->Description(D->CompilationFirstPassOption())->Option().c_str()); } } } else { optionString->setText(""); shortDescription->setText(""); editorDescription->setText(""); } /* QString n; n.setNum(OD->DescriptionNumber()); */ } CompilerOptionInfo::~CompilerOptionInfo() { } |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:27:34
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Basic In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15724 Added Files: BenchmarkHolder.cpp BenchmarkHolder.h Info.cpp Info.h OptionHolder.cpp OptionHolder.h OptionSetHolder.cpp OptionSetHolder.h PlanBatchHolder.cpp PlanBatchHolder.h Log Message: First import. --- NEW FILE: OptionHolder.h --- #ifndef H_CQT_OPTIONHOLDER #define H_CQT_OPTIONHOLDER #include <Compiler/Compiler-Option.h> namespace CQT { class OptionHolder { private: CBM::CompilerOption *option; protected: OptionHolder(CBM::CompilerOption *_option); public: virtual CBM::CompilerOption *Option(void); virtual ~OptionHolder(); }; } #endif --- NEW FILE: BenchmarkHolder.h --- #ifndef H_CQT_BENCHMARKHOLDER #define H_CQT_BENCHMARKHOLDER #include <Benchmark/Benchmark.h> #include <QMetaType> Q_DECLARE_METATYPE(CBM::Benchmark*) namespace CQT { class BenchmarkHolder { private: CBM::Benchmark *benchmark; protected: BenchmarkHolder(CBM::Benchmark *_benchmark); public: virtual CBM::Benchmark *Benchmark(void); virtual ~BenchmarkHolder(); }; } #endif --- NEW FILE: Info.cpp --- #include <Basic/Info.h> #include <QLabel> using namespace CQT; InfoTab::InfoTab(QWidget *parent) : QWidget(parent) { lay=new QGridLayout; layIndex=0; setLayout(lay); } QLineEdit *InfoTab::addInfo(std::string _label, std::string _value) { QLabel *l; QLineEdit *v; l=new QLabel(tr(_label.c_str())); v=new QLineEdit(_value.c_str()); v->setReadOnly(true); lay->addWidget(l, layIndex, 0); lay->addWidget(v, layIndex, 1); layIndex++; return(v); } QTextEdit *InfoTab::addText(std::string _value) { QTextEdit *v; v = new QTextEdit(_value.c_str()); v->setReadOnly(true); lay->addWidget(v, layIndex, 0); layIndex++; return(v); } QTextEdit *InfoTab::addText(std::string _label, std::string _value) { QLabel *l; QTextEdit *v; l=new QLabel(tr(_label.c_str())); v=new QTextEdit(_value.c_str()); v->setReadOnly(true); lay->addWidget(l, layIndex, 0); lay->addWidget(v, layIndex, 1); layIndex++; return(v); } void InfoTab::addSpace(void) { lay->setRowStretch(20,20); } QGridLayout *InfoTab::Layout(void) { return(lay); } InfoTab::~InfoTab() { } --- NEW FILE: Info.h --- #ifndef H_CQT_INFO #define H_CQT_INFO #include <QGridLayout> #include <QLineEdit> #include <QTextEdit> namespace CQT { class InfoTab : public QWidget { private: QGridLayout *lay; int layIndex; protected: public: InfoTab(QWidget *parent = 0); virtual QLineEdit *addInfo(std::string _label, std::string _value); virtual QTextEdit *addText(std::string _value); virtual QTextEdit *addText(std::string _label, std::string _value); virtual void addSpace(void); virtual QGridLayout *Layout(void); virtual ~InfoTab(); }; } #endif --- NEW FILE: OptionSetHolder.cpp --- #include <Basic/OptionSetHolder.h> using namespace CQT; OptionSetHolder::OptionSetHolder(CBM::CompilerOptionSet *_options) { options=_options; } CBM::CompilerOptionSet *OptionSetHolder::OptionSet(void) { return(options); } OptionSetHolder::~OptionSetHolder() { } --- NEW FILE: PlanBatchHolder.cpp --- #include <Basic/PlanBatchHolder.h> using namespace CQT; PlanBatchHolder::PlanBatchHolder(CBM::PlanBatch *_batch) { batch=_batch; } CBM::PlanBatch *PlanBatchHolder::Batch(void) { return(batch); } PlanBatchHolder::~PlanBatchHolder() { } --- NEW FILE: OptionSetHolder.h --- #ifndef H_CQT_OPTIONSETHOLDER #define H_CQT_OPTIONSETHOLDER #include <Compiler/Compiler-OptionSet.h> namespace CQT { class OptionSetHolder { private: CBM::CompilerOptionSet *options; protected: OptionSetHolder(CBM::CompilerOptionSet *_options); public: virtual CBM::CompilerOptionSet *OptionSet(void); virtual ~OptionSetHolder(); }; } #endif --- NEW FILE: OptionHolder.cpp --- #include <Basic/OptionHolder.h> using namespace CQT; OptionHolder::OptionHolder(CBM::CompilerOption *_option) { option=_option; } CBM::CompilerOption *OptionHolder::Option(void) { return(option); } OptionHolder::~OptionHolder() { } --- NEW FILE: PlanBatchHolder.h --- #ifndef H_CQT_PLANBATCHHOLDER #define H_CQT_PLANBATCHHOLDER #include <Plan/Plan-Batch.h> namespace CQT { class PlanBatchHolder { private: CBM::PlanBatch *batch; protected: PlanBatchHolder(CBM::PlanBatch *_batch); public: virtual CBM::PlanBatch *Batch(void); virtual ~PlanBatchHolder(); }; } #endif --- NEW FILE: BenchmarkHolder.cpp --- #include <Basic/BenchmarkHolder.h> using namespace CQT; BenchmarkHolder::BenchmarkHolder(CBM::Benchmark *_benchmark) { benchmark=_benchmark; } CBM::Benchmark *BenchmarkHolder::Benchmark(void) { return(benchmark); } BenchmarkHolder::~BenchmarkHolder() { } |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:26:38
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/CompilerOption In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15336/CompilerOption Log Message: Directory /cvsroot/compbench/CompBenchmarks++/Qt-4/CompilerOption added to the repository |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:26:26
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Basic In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15298/Basic Log Message: Directory /cvsroot/compbench/CompBenchmarks++/Qt-4/Basic added to the repository |
|
From: Frederic T. <xf...@us...> - 2007-05-22 17:26:26
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15149 Modified Files: main.cpp main.h Log Message: Option information message and layout. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** main.cpp 21 May 2007 19:42:45 -0000 1.7 --- main.cpp 22 May 2007 17:26:06 -0000 1.8 *************** *** 5,8 **** --- 5,9 ---- #include <Plan/PlanAvailableCompiler.h> + #include <CompilerOption/CompilerOptionInfo.h> #include <QFileDialog> *************** *** 160,163 **** --- 161,168 ---- Qt::QueuedConnection); + connect(this, SIGNAL(sigOptionInfo(CBM::CompilerOption*)), + this, SLOT(doOptionInfo(CBM::CompilerOption*)), + Qt::QueuedConnection); + connect(this, SIGNAL(sigPlanCompilerSelected(CBM::Compiler*)), this, SLOT(doPlanCompilerSelected(CBM::Compiler*)), *************** *** 266,269 **** --- 271,286 ---- } + void Application::doOptionInfo(CBM::CompilerOption *_option) + { + QWidget *W = new CompilerOptionInfo(_option->Option()); + std::string title; + + title="Informations about "; + title+=_option->Option(); + W->setWindowTitle(title.c_str()); + W->setWindowIcon(QIcon(":/icons/tip.png")); + W->show(); + } + void Application::doPlanBatchRegister(CBM::PlanBatch *_batch) { *************** *** 382,385 **** --- 399,407 ---- } + void Application::optionInfo(CBM::CompilerOption *_option) + { + emit sigOptionInfo(_option); + } + void Application::planCompilerSelect(CBM::Compiler *_compiler) { Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.h 21 May 2007 19:42:45 -0000 1.6 --- main.h 22 May 2007 17:26:06 -0000 1.7 *************** *** 74,77 **** --- 74,79 ---- void sigCompilerRegister(CBM::Compiler *_compiler); void sigCompilerInfo(CBM::Compiler *_compiler); + void sigOptionInfo(CBM::CompilerOption *_option); + void sigCompilerUnregister(CBM::Compiler *_compiler); *************** *** 99,102 **** --- 101,105 ---- void doCompilerUnregister(CBM::Compiler *_compiler); void doCompilerInfo(CBM::Compiler *_compiler); + void doOptionInfo(CBM::CompilerOption *_option); void doCompilerAutodetect(void); *************** *** 129,132 **** --- 132,136 ---- virtual void compilerUnregister(CBM::Compiler *_compiler); virtual void compilerInfo(CBM::Compiler *_compiler); + virtual void optionInfo(CBM::CompilerOption *_option); virtual void planBatchRegister(CBM::PlanBatch *_batch); |
|
From: Frederic T. <xf...@us...> - 2007-05-21 19:59:18
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6626 Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Rename methods fixed (signal is now set). Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlanDefineBatch.cpp 21 May 2007 19:42:14 -0000 1.6 --- PlanDefineBatch.cpp 21 May 2007 19:59:14 -0000 1.7 *************** *** 139,142 **** --- 139,143 ---- { setFlags(Qt::ItemIsEditable | flags()); + addChild(new PlanDefineBatchListItem(PICompilers)); addChild(new PlanDefineBatchListItem(PIOptionSets)); *************** *** 262,265 **** --- 263,268 ---- Qt::QueuedConnection); + connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)), + this, SLOT(itemEdited(QTreeWidgetItem*, int))); headerItem()->setHidden(true); *************** *** 318,321 **** --- 321,343 ---- } + void PlanDefineBatchList::itemEdited(QTreeWidgetItem *item, int) + { + PlanDefineBatchListItem *I = (PlanDefineBatchListItem*) item; + + switch(item->type()) { + case PIPlanBatch: + App->planBatchRenamed(I->Batch(), + I->text(0)); + break; + case PIOptionSet: + + App->planOptionSetRenamed(I->Nearest(PIPlanBatch)->Batch(), + I->OptionSet(), + I->text(0)); + break; + default: + break; + } + } void PlanDefineBatchList::doPlanBatchRegister(CBM::PlanBatch *_batch) *************** *** 353,359 **** PlanDefineBatchListItem *I = Item(_batch); - printf("plan ren?\n"); if (I) { - printf("plan ren!\n"); I->Batch()->setId(_newname.toStdString()); } --- 375,379 ---- *************** *** 399,406 **** PlanDefineBatchListItem *I = Item(_batch, _options); - printf("rename I=%x\n", (unsigned int) I); if (I) { ! printf("newid = %s\n", _newname.toStdString().c_str()); ! I->Batch()->setId(_newname.toStdString()); } } --- 419,424 ---- PlanDefineBatchListItem *I = Item(_batch, _options); if (I) { ! _options->setId(_newname.toStdString()); } } Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PlanDefineBatch.h 21 May 2007 19:42:14 -0000 1.6 --- PlanDefineBatch.h 21 May 2007 19:59:14 -0000 1.7 *************** *** 112,115 **** --- 112,118 ---- protected slots: + + virtual void itemEdited(QTreeWidgetItem *item, int); + virtual void doPlanBatchRegister(CBM::PlanBatch *_batch); virtual void doPlanBatchUnregister(CBM::PlanBatch *_batch); |
|
From: Frederic T. <xf...@us...> - 2007-05-21 19:42:49
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32147 Modified Files: main.cpp main.h Log Message: OptionSet can be handled. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.cpp 21 May 2007 17:16:40 -0000 1.6 --- main.cpp 21 May 2007 19:42:45 -0000 1.7 *************** *** 184,187 **** --- 184,204 ---- Qt::QueuedConnection); + connect(this, SIGNAL(sigPlanOptionSetRegister(CBM::PlanBatch*)), + this, SLOT(doPlanOptionSetRegister(CBM::PlanBatch*)), + Qt::QueuedConnection); + + connect(this, SIGNAL(sigPlanOptionSetUnregister(CBM::PlanBatch*, + CBM::CompilerOptionSet*)), + this, SLOT(doPlanOptionSetUnregister(CBM::PlanBatch*, + CBM::CompilerOptionSet*)), + Qt::QueuedConnection); + + connect(this, SIGNAL(sigPlanOptionSetRenamed(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + QString)), + this, SLOT(doPlanOptionSetRenamed(CBM::PlanBatch*, + CBM::CompilerOptionSet*, + QString)), + Qt::QueuedConnection); } *************** *** 273,276 **** --- 290,313 ---- } + void Application::doPlanOptionSetRegister(CBM::PlanBatch *_batch) + { + planManager->Define()->Batch()->optionSetRegister(_batch); + } + + void Application::doPlanOptionSetUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options) + { + planManager->Define()->Batch()->optionSetUnregister(_batch, _options); + } + + void Application::doPlanOptionSetRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options, + QString _newname) + { + planManager->Define()->Batch()->optionSetRenamed(_batch, + _options, + _newname); + } + void Application::doPlanCompilerSelected(CBM::Compiler *_compiler) *************** *** 373,376 **** --- 410,431 ---- } + void Application::planOptionSetRegister(CBM::PlanBatch *_batch) + { + emit sigPlanOptionSetRegister(_batch); + } + + void Application::planOptionSetUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options) + { + emit sigPlanOptionSetUnregister(_batch, _options); + } + + void Application::planOptionSetRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options, + QString _newname) + { + emit sigPlanOptionSetRenamed(_batch, _options, _newname); + } + CBM::Compiler *Application::PlanCompilerSelected(void) { Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** main.h 21 May 2007 17:16:40 -0000 1.5 --- main.h 21 May 2007 19:42:45 -0000 1.6 *************** *** 83,86 **** --- 83,93 ---- CBM::Compiler *_compiler); + void sigPlanOptionSetRegister(CBM::PlanBatch *_batch); + void sigPlanOptionSetUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options); + void sigPlanOptionSetRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options, + QString _newname); + void sigPlanCompilerSelected(CBM::Compiler *_compiler); *************** *** 104,107 **** --- 111,121 ---- CBM::Compiler *_compiler); + virtual void doPlanOptionSetRegister(CBM::PlanBatch *_batch); + virtual void doPlanOptionSetUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options); + virtual void doPlanOptionSetRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options, + QString _newname); + void doPlanCompilerSelected(CBM::Compiler *_compiler); *************** *** 123,126 **** --- 137,147 ---- CBM::Compiler *_compiler); + virtual void planOptionSetRegister(CBM::PlanBatch *_batch); + virtual void planOptionSetUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options); + virtual void planOptionSetRenamed(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_options, + QString _newname); + virtual void planCompilerSelect(CBM::Compiler *_compiler); |
