[Compbench-devel] CompBenchmarks++/SupportedBenchmarks Benchmark-BENCHPP.cpp, 1.8, 1.9 Benchmark-BENCHPPLINUX.cpp, 1.12, 1.13 Benchmark-BZIP2.cpp, 1.9, 1.10 Benchmark-GZIP.cpp, 1.9, 1.10 Benchmark-LINPACKC.cpp, 1.11, 1.12 Benchmark-NBENCH.cpp, 1.7, 1.8 Benchmark-SCIMARK2.cpp, 1.9, 1.10 benchmarks-genlibwrapper.pl, 1.5, 1.6 Makefile.am, 1.5, 1.6 Benchmark-BENCHPP.libwrapper.h, 1.6, NONE Benchmark-BENCHPPLINUX.libwrapper.h, 1.6, NONE Benchmark-BZIP2.libwrapper.h, 1.6, NONE Benchmark-GZIP.libwrapper.h, 1.6, NONE Benchmark-LINPACKC.libwrapper.h, 1.7, NONE Benchmark-NBENCH.libwrapper.h, 1.6, NONE Benchmark-SCIMARK2.libwrapper.h, 1.6, NONE

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

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

Modified Files:
	Benchmark-BENCHPP.cpp Benchmark-BENCHPPLINUX.cpp 
	Benchmark-BZIP2.cpp Benchmark-GZIP.cpp Benchmark-LINPACKC.cpp 
	Benchmark-NBENCH.cpp Benchmark-SCIMARK2.cpp 
	benchmarks-genlibwrapper.pl Makefile.am 
Removed Files:
	Benchmark-BENCHPP.libwrapper.h 
	Benchmark-BENCHPPLINUX.libwrapper.h 
	Benchmark-BZIP2.libwrapper.h Benchmark-GZIP.libwrapper.h 
	Benchmark-LINPACKC.libwrapper.h Benchmark-NBENCH.libwrapper.h 
	Benchmark-SCIMARK2.libwrapper.h 
Log Message:
Extension for generated wrapping include files is now .inc -

Index: Benchmark-BENCHPP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPP.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Benchmark-BENCHPP.cpp	17 Apr 2007 18:20:54 -0000	1.8
--- Benchmark-BENCHPP.cpp	6 Sep 2007 17:38:10 -0000	1.9
***************
*** 14,18 ****
  #include <fstream>
  
! #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h>
  
  PackageBENCHPP::PackageBENCHPP(CBM::System *_system)
--- 14,18 ----
  #include <fstream>
  
! #include <SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.inc>
  
  PackageBENCHPP::PackageBENCHPP(CBM::System *_system)

--- Benchmark-NBENCH.libwrapper.h DELETED ---

Index: Benchmark-NBENCH.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-NBENCH.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Benchmark-NBENCH.cpp	17 Apr 2007 18:20:54 -0000	1.7
--- Benchmark-NBENCH.cpp	6 Sep 2007 17:38:10 -0000	1.8
***************
*** 13,17 ****
  
  #include <fstream>
! #include <SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h>
  
  using namespace CBM;
--- 13,17 ----
  
  #include <fstream>
! #include <SupportedBenchmarks/Benchmark-NBENCH.libwrapper.inc>
  
  using namespace CBM;

Index: benchmarks-genlibwrapper.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/benchmarks-genlibwrapper.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** benchmarks-genlibwrapper.pl	15 Feb 2007 18:54:10 -0000	1.5
--- benchmarks-genlibwrapper.pl	6 Sep 2007 17:38:10 -0000	1.6
***************
*** 7,11 ****
  my $BENCHLIST_DIR = $ARGV[1];
  
! $PACKAGE=~ s/.+Benchmark-(.*?)\.libwrapper.h/$1/;
  
  sub parse {
--- 7,11 ----
  my $BENCHLIST_DIR = $ARGV[1];
  
! $PACKAGE=~ s/.+Benchmark-(.*?)\.libwrapper.inc/$1/;
  
  sub parse {

--- Benchmark-BENCHPPLINUX.libwrapper.h DELETED ---

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BZIP2.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Benchmark-BZIP2.cpp	17 Apr 2007 18:20:54 -0000	1.9
--- Benchmark-BZIP2.cpp	6 Sep 2007 17:38:10 -0000	1.10
***************
*** 14,18 ****
  #include <fstream>
  
! #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h>
  
  using namespace CBM;
--- 14,18 ----
  #include <fstream>
  
! #include <SupportedBenchmarks/Benchmark-BZIP2.libwrapper.inc>
  
  using namespace CBM;

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-GZIP.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Benchmark-GZIP.cpp	17 Apr 2007 18:20:54 -0000	1.9
--- Benchmark-GZIP.cpp	6 Sep 2007 17:38:10 -0000	1.10
***************
*** 14,18 ****
  #include <config.h>
  
! #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.h>
  #include <Benchmark/Benchmark-DLLoader.h>
  #include <UI/UI.h>
--- 14,18 ----
  #include <config.h>
  
! #include <SupportedBenchmarks/Benchmark-GZIP.libwrapper.inc>
  #include <Benchmark/Benchmark-DLLoader.h>
  #include <UI/UI.h>

--- Benchmark-SCIMARK2.libwrapper.h DELETED ---

--- Benchmark-BENCHPP.libwrapper.h DELETED ---

--- Benchmark-LINPACKC.libwrapper.h DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	29 Aug 2007 19:34:46 -0000	1.5
--- Makefile.am	6 Sep 2007 17:38:10 -0000	1.6
***************
*** 24,47 ****
  libcompbenchmarks_bm_linpackc_la_LIBADD 	= ../libcompbenchmarks/libcompbenchmarks.la
  
! Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.h
! libcompbenchmarks_bm_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.h
  
! Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.h
! libcompbenchmarks_bm_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.h
  
! Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.h
! libcompbenchmarks_bm_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.h
  
! Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h
! libcompbenchmarks_bm_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.h
  
! Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.h
! libcompbenchmarks_bm_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.h
  
! Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h
! libcompbenchmarks_bm_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.h
  
! Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h
! libcompbenchmarks_bm_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.h
  
  INCLUDES				=	-I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
--- 24,47 ----
  libcompbenchmarks_bm_linpackc_la_LIBADD 	= ../libcompbenchmarks/libcompbenchmarks.la
  
! Benchmark-GZIP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-GZIP.libwrapper.inc
! libcompbenchmarks_bm_gzip_la_SOURCES	=	Benchmark-GZIP.cpp Benchmark-GZIP.h Benchmark-GZIP.libwrapper.inc
  
! Benchmark-BZIP2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BZIP2.libwrapper.inc
! libcompbenchmarks_bm_bzip2_la_SOURCES	=	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-BZIP2.libwrapper.inc
  
! Benchmark-NBENCH.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-NBENCH.libwrapper.inc
! libcompbenchmarks_bm_nbench_la_SOURCES	=	Benchmark-NBENCH.cpp Benchmark-NBENCH.h Benchmark-NBENCH.libwrapper.inc
  
! Benchmark-SCIMARK2.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.inc
! libcompbenchmarks_bm_scimark2_la_SOURCES	=	Benchmark-SCIMARK2.cpp Benchmark-SCIMARK2.h Benchmark-SCIMARK2.libwrapper.inc
  
! Benchmark-BENCHPP.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPP.libwrapper.inc
! libcompbenchmarks_bm_benchpp_la_SOURCES	=	Benchmark-BENCHPP.cpp Benchmark-BENCHPP.h Benchmark-BENCHPP.libwrapper.inc
  
! Benchmark-BENCHPPLINUX.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.inc
! libcompbenchmarks_bm_benchpplinux_la_SOURCES	=	Benchmark-BENCHPPLINUX.cpp Benchmark-BENCHPPLINUX.h Benchmark-BENCHPPLINUX.libwrapper.inc
  
! Benchmark-LINPACKC.cpp: $(top_srcdir)/SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.inc
! libcompbenchmarks_bm_linpackc_la_SOURCES   =	Benchmark-LINPACKC.cpp Benchmark-LINPACKC.h Benchmark-LINPACKC.libwrapper.inc
  
  INCLUDES				=	-I $(top_srcdir)/libcompbenchmarks -I $(top_srcdir)
***************
*** 52,57 ****
  EXTRA_DIST				=	benchmarks-genlibwrapper.pl benchmarks.list
  
! $(top_srcdir)/SupportedBenchmarks/%.libwrapper.h: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
  	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@
  
! clean-all: rm *.libwrapper.h
\ No newline at end of file
--- 52,57 ----
  EXTRA_DIST				=	benchmarks-genlibwrapper.pl benchmarks.list
  
! $(top_srcdir)/SupportedBenchmarks/%.libwrapper.inc: $(top_srcdir)/SupportedBenchmarks/benchmarks.list $(CBM_GENLIBWRAPPER)
  	$(CBM_GENLIBWRAPPER) $@ $(top_srcdir)/SupportedBenchmarks > $@
  
! clean-all: rm *.libwrapper.inc
\ No newline at end of file

Index: Benchmark-SCIMARK2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-SCIMARK2.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Benchmark-SCIMARK2.cpp	6 Jun 2007 16:03:02 -0000	1.9
--- Benchmark-SCIMARK2.cpp	6 Sep 2007 17:38:10 -0000	1.10
***************
*** 12,16 ****
  #include <config.h>
  
! #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.h>
  
  using namespace CBM;
--- 12,16 ----
  #include <config.h>
  
! #include <SupportedBenchmarks/Benchmark-SCIMARK2.libwrapper.inc>
  
  using namespace CBM;

--- Benchmark-GZIP.libwrapper.h DELETED ---

Index: Benchmark-LINPACKC.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-LINPACKC.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Benchmark-LINPACKC.cpp	17 Apr 2007 18:20:54 -0000	1.11
--- Benchmark-LINPACKC.cpp	6 Sep 2007 17:38:10 -0000	1.12
***************
*** 12,16 ****
  #include <config.h>
  
! #include <SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.h>
  
  using namespace CBM;
--- 12,16 ----
  #include <config.h>
  
! #include <SupportedBenchmarks/Benchmark-LINPACKC.libwrapper.inc>
  
  using namespace CBM;

Index: Benchmark-BENCHPPLINUX.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/SupportedBenchmarks/Benchmark-BENCHPPLINUX.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Benchmark-BENCHPPLINUX.cpp	23 May 2007 15:26:53 -0000	1.12
--- Benchmark-BENCHPPLINUX.cpp	6 Sep 2007 17:38:10 -0000	1.13
***************
*** 16,20 ****
  #include <stdlib.h>
  
! #include <SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.h>
  
  using namespace CBM;
--- 16,20 ----
  #include <stdlib.h>
  
! #include <SupportedBenchmarks/Benchmark-BENCHPPLINUX.libwrapper.inc>
  
  using namespace CBM;

--- Benchmark-BZIP2.libwrapper.h DELETED ---