Thread: [Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.5, 1.6 CBM.pm, 1.10, 1.11 CBM_wrap.cxx, 1.10, 1.
Brought to you by:
xfred
Menu
▾
▴
compbench-devel
|
From: Frederic T. <xf...@us...> - 2007-01-22 18:17:25
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17858 Modified Files: CBM.i CBM.pm CBM_wrap.cxx Glue.cpp Glue.h Makefile.am Log Message: libcompbenchmarks moved in a separate directory. Index: CBM.pm =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CBM.pm 21 Jan 2007 21:28:07 -0000 1.10 --- CBM.pm 22 Jan 2007 18:17:20 -0000 1.11 *************** *** 52,143 **** *c_str = *CBMc::c_str; - ############# Class : CBM::XMLAttribute ############## - - package CBM::XMLAttribute; - use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); - @ISA = qw( CBM ); - %OWNER = (); - %ITERATORS = (); - sub new { - my $pkg = shift; - my $self = CBMc::new_XMLAttribute(@_); - bless $self, $pkg if defined($self); - } - - *Name = *CBMc::XMLAttribute_Name; - *Value = *CBMc::XMLAttribute_Value; - *setValue = *CBMc::XMLAttribute_setValue; - sub DESTROY { - return unless $_[0]->isa('HASH'); - my $self = tied(%{$_[0]}); - return unless defined $self; - delete $ITERATORS{$self}; - if (exists $OWNER{$self}) { - CBMc::delete_XMLAttribute($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::XMLNode ############## - - package CBM::XMLNode; - use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); - @ISA = qw( CBM ); - %OWNER = (); - %ITERATORS = (); - sub new { - my $pkg = shift; - my $self = CBMc::new_XMLNode(@_); - bless $self, $pkg if defined($self); - } - - *Name = *CBMc::XMLNode_Name; - *Value = *CBMc::XMLNode_Value; - *setValue = *CBMc::XMLNode_setValue; - *childNumber = *CBMc::XMLNode_childNumber; - *getChild = *CBMc::XMLNode_getChild; - *attributeNumber = *CBMc::XMLNode_attributeNumber; - *getAttribute = *CBMc::XMLNode_getAttribute; - *addNode = *CBMc::XMLNode_addNode; - *add = *CBMc::XMLNode_add; - *addAttribute = *CBMc::XMLNode_addAttribute; - *str = *CBMc::XMLNode_str; - sub DESTROY { - return unless $_[0]->isa('HASH'); - my $self = tied(%{$_[0]}); - return unless defined $self; - delete $ITERATORS{$self}; - if (exists $OWNER{$self}) { - CBMc::delete_XMLNode($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::Package ############## --- 52,55 ---- *************** *** 187,190 **** --- 99,103 ---- *Configure = *CBMc::Package_Configure; *Make = *CBMc::Package_Make; + *buildTime = *CBMc::Package_buildTime; *Test = *CBMc::Package_Test; *Release = *CBMc::Package_Release; *************** *** 253,256 **** --- 166,257 ---- + ############# Class : CBM::XMLAttribute ############## + + package CBM::XMLAttribute; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_XMLAttribute(@_); + bless $self, $pkg if defined($self); + } + + *Name = *CBMc::XMLAttribute_Name; + *Value = *CBMc::XMLAttribute_Value; + *setValue = *CBMc::XMLAttribute_setValue; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_XMLAttribute($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::XMLNode ############## + + package CBM::XMLNode; + use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS); + @ISA = qw( CBM ); + %OWNER = (); + %ITERATORS = (); + sub new { + my $pkg = shift; + my $self = CBMc::new_XMLNode(@_); + bless $self, $pkg if defined($self); + } + + *Name = *CBMc::XMLNode_Name; + *Value = *CBMc::XMLNode_Value; + *setValue = *CBMc::XMLNode_setValue; + *childNumber = *CBMc::XMLNode_childNumber; + *getChild = *CBMc::XMLNode_getChild; + *attributeNumber = *CBMc::XMLNode_attributeNumber; + *getAttribute = *CBMc::XMLNode_getAttribute; + *addNode = *CBMc::XMLNode_addNode; + *add = *CBMc::XMLNode_add; + *addAttribute = *CBMc::XMLNode_addAttribute; + *str = *CBMc::XMLNode_str; + sub DESTROY { + return unless $_[0]->isa('HASH'); + my $self = tied(%{$_[0]}); + return unless defined $self; + delete $ITERATORS{$self}; + if (exists $OWNER{$self}) { + CBMc::delete_XMLNode($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::System ############## Index: Glue.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Glue.cpp 21 Jan 2007 20:47:56 -0000 1.5 --- Glue.cpp 22 Jan 2007 18:17:20 -0000 1.6 *************** *** 10,14 **** #include <CBM-PI/Glue.h> ! #include <Benchmark/Benchmark-DLLoader.h> CBM_SYSTEM *sys; --- 10,14 ---- #include <CBM-PI/Glue.h> ! #include <libcompbenchmarks.h> CBM_SYSTEM *sys; Index: CBM_wrap.cxx =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CBM_wrap.cxx 21 Jan 2007 21:28:07 -0000 1.10 --- CBM_wrap.cxx 22 Jan 2007 18:17:20 -0000 1.11 *************** *** 1469,1473 **** #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" ! #include "System/XML.h" using namespace CBM; --- 1469,1473 ---- #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" ! #include "Base/XML.h" using namespace CBM; [...2767 lines suppressed...] {"CBMc::System_init", _wrap_System_init}, {"CBMc::System_hostid", _wrap_System_hostid}, *************** *** 8092,8097 **** SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLAttribute, (void*) "CBM::XMLAttribute"); - SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLNode, (void*) "CBM::XMLNode"); /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Package_Unknown", TRUE | 0x2); --- 8122,8125 ---- *************** *** 8141,8144 **** --- 8169,8174 ---- SWIG_TypeClientData(SWIGTYPE_p_CBM__Package, (void*) "CBM::Package"); SWIG_TypeClientData(SWIGTYPE_p_CBM__Benchmark, (void*) "CBM::Benchmark"); + SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLAttribute, (void*) "CBM::XMLAttribute"); + SWIG_TypeClientData(SWIGTYPE_p_CBM__XMLNode, (void*) "CBM::XMLNode"); /*@SWIG:%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "System_Root", TRUE | 0x2); Index: CBM.i =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CBM.i 21 Jan 2007 20:47:56 -0000 1.5 --- CBM.i 22 Jan 2007 18:17:20 -0000 1.6 *************** *** 9,20 **** #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" ! #include "System/XML.h" using namespace CBM; %} %include "libcompbenchmarks.h" - %include "System/XML.h" %include "Benchmark/Package.h" %include "Benchmark/Benchmark.h" %include "System/System.h" %include "Compiler/Compiler.h" --- 9,20 ---- #include "Benchmark/Benchmark.h" #include "Compiler/Compiler.h" ! #include "Base/XML.h" using namespace CBM; %} %include "libcompbenchmarks.h" %include "Benchmark/Package.h" %include "Benchmark/Benchmark.h" + %include "Base/XML.h" %include "System/System.h" %include "Compiler/Compiler.h" Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 21 Jan 2007 21:41:04 -0000 1.6 --- Makefile.am 22 Jan 2007 18:17:20 -0000 1.7 *************** *** 1,8 **** lib_LTLIBRARIES = libCBM.la ! libCBM_la_SOURCES = Glue.cpp CBM_wrap.cxx SUBDIRS = t ! INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/CBM-PI -I.. -I. # LDFLAGS = -L../testing/.libs -lcompbenchmarks PERL = @CBM_PROG_PERL@ --- 1,17 ---- + # ----------------------------------------------------------------------------- + # $Id$ + # + # This is free software. + # For details, see the GNU Public License in the COPYING file, or + # Look http://www.fsf.org + # ----------------------------------------------------------------------------- + lib_LTLIBRARIES = libCBM.la ! libCBM_la_SOURCES = Glue.cpp Glue.h CBM_wrap.cxx SUBDIRS = t ! INCLUDES = -I$(top_srcdir)/libcompbenchmarks -I$(top_srcdir)/CBM-PI -I.. -I. -I$(top_srcdir) ! # LDFLAGS = -L../testing/.libs -lcompbenchmarks PERL = @CBM_PROG_PERL@ *************** *** 23,30 **** AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` ! ../libcompbenchmarks.la: ! make -C .. libcompbenchmarks.la ! ! libCBM_la_LIBADD = ../libcompbenchmarks.la test: --- 32,36 ---- AM_CXXFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` ! libCBM_la_LIBADD = ../libcompbenchmarks/libcompbenchmarks.la test: Index: Glue.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Glue.h 21 Jan 2007 20:47:56 -0000 1.3 --- Glue.h 22 Jan 2007 18:17:20 -0000 1.4 *************** *** 12,16 **** #include <libcompbenchmarks.h> - #include <Benchmark/Benchmark.h> extern CBM::System *Init(void); --- 12,15 ---- |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X