[Compbench-devel] CompBenchmarks++/CBM-PI CBM.i, 1.4, 1.5 CBM.pm, 1.7, 1.8 CBM_wrap.cxx, 1.7, 1.8 Glue.cpp, 1.4, 1.5 Glue.h, 1.2, 1.3

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19925

Modified Files:
	CBM.i CBM.pm CBM_wrap.cxx Glue.cpp Glue.h 
Log Message:
API changes.
CBM namespace.

Index: CBM.pm
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CBM.pm	17 Jan 2007 19:21:17 -0000	1.7
--- CBM.pm	21 Jan 2007 20:47:56 -0000	1.8
***************
*** 52,112 ****
  *c_str = *CBMc::c_str;
  
! ############# Class : CBM::CBMSystem ##############
! 
! package CBM::CBMSystem;
! use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
! @ISA = qw( CBM );
! %OWNER = ();
! *Root = *CBMc::CBMSystem_Root;
! *HostDep = *CBMc::CBMSystem_HostDep;
! *Extract = *CBMc::CBMSystem_Extract;
! *Patches = *CBMc::CBMSystem_Patches;
! *System = *CBMc::CBMSystem_System;
! *Download = *CBMc::CBMSystem_Download;
! *Status = *CBMc::CBMSystem_Status;
! *Configuration = *CBMc::CBMSystem_Configuration;
! *init = *CBMc::CBMSystem_init;
! *packageList = *CBMc::CBMSystem_packageList;
! *packageNumber = *CBMc::CBMSystem_packageNumber;
! *Package = *CBMc::CBMSystem_Package;
! *Benchmark = *CBMc::CBMSystem_Benchmark;
! *displayAllPackages = *CBMc::CBMSystem_displayAllPackages;
! *displayAllBenchmarks = *CBMc::CBMSystem_displayAllBenchmarks;
! *Split = *CBMc::CBMSystem_Split;
! *Chomp = *CBMc::CBMSystem_Chomp;
! *display = *CBMc::CBMSystem_display;
! *displayPrograms = *CBMc::CBMSystem_displayPrograms;
! *exec = *CBMc::CBMSystem_exec;
! *md5 = *CBMc::CBMSystem_md5;
! *md5File = *CBMc::CBMSystem_md5File;
! *download = *CBMc::CBMSystem_download;
! *copy = *CBMc::CBMSystem_copy;
! *mkdir = *CBMc::CBMSystem_mkdir;
! *checkDirectory = *CBMc::CBMSystem_checkDirectory;
! *temporaryDirectory = *CBMc::CBMSystem_temporaryDirectory;
! *unlink = *CBMc::CBMSystem_unlink;
! *store = *CBMc::CBMSystem_store;
! *read = *CBMc::CBMSystem_read;
! *fileExists = *CBMc::CBMSystem_fileExists;
! *Time = *CBMc::CBMSystem_Time;
! *done = *CBMc::CBMSystem_done;
! *getLastCommand = *CBMc::CBMSystem_getLastCommand;
! *getLastCommandOutput = *CBMc::CBMSystem_getLastCommandOutput;
! 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::CBMXMLAttribute ##############
  
! package CBM::CBMXMLAttribute;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
--- 52,58 ----
  *c_str = *CBMc::c_str;
  
! ############# Class : CBM::XMLAttribute ##############
  
! package CBM::XMLAttribute;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
***************
*** 115,125 ****
  sub new {
      my $pkg = shift;
!     my $self = CBMc::new_CBMXMLAttribute(@_);
      bless $self, $pkg if defined($self);
  }
  
! *Name = *CBMc::CBMXMLAttribute_Name;
! *Value = *CBMc::CBMXMLAttribute_Value;
! *setValue = *CBMc::CBMXMLAttribute_setValue;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
--- 61,71 ----
  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');
***************
*** 128,132 ****
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CBMXMLAttribute($self);
          delete $OWNER{$self};
      }
--- 74,78 ----
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_XMLAttribute($self);
          delete $OWNER{$self};
      }
***************
*** 146,152 ****
  
  
! ############# Class : CBM::CBMXMLNode ##############
  
! package CBM::CBMXMLNode;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
--- 92,98 ----
  
  
! ############# Class : CBM::XMLNode ##############
  
! package CBM::XMLNode;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
***************
*** 155,213 ****
  sub new {
      my $pkg = shift;
!     my $self = CBMc::new_CBMXMLNode(@_);
      bless $self, $pkg if defined($self);
  }
  
! *Name = *CBMc::CBMXMLNode_Name;
! *Value = *CBMc::CBMXMLNode_Value;
! *setValue = *CBMc::CBMXMLNode_setValue;
! *childNumber = *CBMc::CBMXMLNode_childNumber;
! *getChild = *CBMc::CBMXMLNode_getChild;
! *attributeNumber = *CBMc::CBMXMLNode_attributeNumber;
! *getAttribute = *CBMc::CBMXMLNode_getAttribute;
! *addNode = *CBMc::CBMXMLNode_addNode;
! *add = *CBMc::CBMXMLNode_add;
! *addAttribute = *CBMc::CBMXMLNode_addAttribute;
! *str = *CBMc::CBMXMLNode_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_CBMXMLNode($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::CBMSystemUnix ##############
! 
! package CBM::CBMSystemUnix;
! use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
! @ISA = qw( CBM::CBMSystem CBM );
! %OWNER = ();
! %ITERATORS = ();
! *copy = *CBMc::CBMSystemUnix_copy;
! *mkdir = *CBMc::CBMSystemUnix_mkdir;
! *checkDirectory = *CBMc::CBMSystemUnix_checkDirectory;
! *arch = *CBMc::CBMSystemUnix_arch;
! *hostid = *CBMc::CBMSystemUnix_hostid;
! *hostname = *CBMc::CBMSystemUnix_hostname;
! *os = *CBMc::CBMSystemUnix_os;
! *os_version = *CBMc::CBMSystemUnix_os_version;
! *unlink = *CBMc::CBMSystemUnix_unlink;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
--- 101,119 ----
  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');
***************
*** 216,220 ****
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CBMSystemUnix($self);
          delete $OWNER{$self};
      }
--- 122,126 ----
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_XMLNode($self);
          delete $OWNER{$self};
      }
***************
*** 234,254 ****
  
  
! ############# Class : CBM::CBMSystemLinux ##############
  
! package CBM::CBMSystemLinux;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
! @ISA = qw( CBM::CBMSystemUnix CBM );
  %OWNER = ();
  %ITERATORS = ();
! sub new {
!     my $pkg = shift;
!     my $self = CBMc::new_CBMSystemLinux(@_);
!     bless $self, $pkg if defined($self);
! }
! 
! *processor_name = *CBMc::CBMSystemLinux_processor_name;
! *processor_mhz = *CBMc::CBMSystemLinux_processor_mhz;
! *processor_cache = *CBMc::CBMSystemLinux_processor_cache;
! *processor_number = *CBMc::CBMSystemLinux_processor_number;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
--- 140,196 ----
  
  
! ############# Class : CBM::Package ##############
  
! package CBM::Package;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
! @ISA = qw( CBM );
  %OWNER = ();
  %ITERATORS = ();
! *Unknown = *CBMc::Package_Unknown;
! *Downloaded = *CBMc::Package_Downloaded;
! *Extracted = *CBMc::Package_Extracted;
! *Patched = *CBMc::Package_Patched;
! *Preconfigured = *CBMc::Package_Preconfigured;
! *Configured = *CBMc::Package_Configured;
! *Made = *CBMc::Package_Made;
! *Tested = *CBMc::Package_Tested;
! *Benchmarked = *CBMc::Package_Benchmarked;
! *hasPatch = *CBMc::Package_hasPatch;
! *resetContext = *CBMc::Package_resetContext;
! *display = *CBMc::Package_display;
! *displayBenchmarks = *CBMc::Package_displayBenchmarks;
! *System = *CBMc::Package_System;
! *Benchmarks = *CBMc::Package_Benchmarks;
! *benchmarkNumber = *CBMc::Package_benchmarkNumber;
! *Benchmark = *CBMc::Package_Benchmark;
! *storeStatus = *CBMc::Package_storeStatus;
! *packageName = *CBMc::Package_packageName;
! *packageVersion = *CBMc::Package_packageVersion;
! *packageSize = *CBMc::Package_packageSize;
! *packageComments = *CBMc::Package_packageComments;
! *localPackageName = *CBMc::Package_localPackageName;
! *language = *CBMc::Package_language;
! *license = *CBMc::Package_license;
! *homePage = *CBMc::Package_homePage;
! *author = *CBMc::Package_author;
! *localPackageAbsoluteName = *CBMc::Package_localPackageAbsoluteName;
! *localPackageAbsoluteDirectory = *CBMc::Package_localPackageAbsoluteDirectory;
! *extractDirectory = *CBMc::Package_extractDirectory;
! *hasTest = *CBMc::Package_hasTest;
! *downloadURL = *CBMc::Package_downloadURL;
! *benchmarkSize = *CBMc::Package_benchmarkSize;
! *ContextMatches = *CBMc::Package_ContextMatches;
! *Download = *CBMc::Package_Download;
! *Extract = *CBMc::Package_Extract;
! *Patch = *CBMc::Package_Patch;
! *PreConfigure = *CBMc::Package_PreConfigure;
! *Configure = *CBMc::Package_Configure;
! *Make = *CBMc::Package_Make;
! *Test = *CBMc::Package_Test;
! *Release = *CBMc::Package_Release;
! *Install = *CBMc::Package_Install;
! *Fetch = *CBMc::Package_Fetch;
! *Uninstall = *CBMc::Package_Uninstall;
! *getStatus = *CBMc::Package_getStatus;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
***************
*** 257,261 ****
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CBMSystemLinux($self);
          delete $OWNER{$self};
      }
--- 199,203 ----
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_Package($self);
          delete $OWNER{$self};
      }
***************
*** 275,331 ****
  
  
! ############# Class : CBM::CBMPackage ##############
  
! package CBM::CBMPackage;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
  %OWNER = ();
  %ITERATORS = ();
! *Unknown = *CBMc::CBMPackage_Unknown;
! *Downloaded = *CBMc::CBMPackage_Downloaded;
! *Extracted = *CBMc::CBMPackage_Extracted;
! *Patched = *CBMc::CBMPackage_Patched;
! *Preconfigured = *CBMc::CBMPackage_Preconfigured;
! *Configured = *CBMc::CBMPackage_Configured;
! *Made = *CBMc::CBMPackage_Made;
! *Tested = *CBMc::CBMPackage_Tested;
! *Benchmarked = *CBMc::CBMPackage_Benchmarked;
! *hasPatch = *CBMc::CBMPackage_hasPatch;
! *resetContext = *CBMc::CBMPackage_resetContext;
! *display = *CBMc::CBMPackage_display;
! *displayBenchmarks = *CBMc::CBMPackage_displayBenchmarks;
! *System = *CBMc::CBMPackage_System;
! *Benchmarks = *CBMc::CBMPackage_Benchmarks;
! *benchmarkNumber = *CBMc::CBMPackage_benchmarkNumber;
! *Benchmark = *CBMc::CBMPackage_Benchmark;
! *storeStatus = *CBMc::CBMPackage_storeStatus;
! *packageName = *CBMc::CBMPackage_packageName;
! *packageVersion = *CBMc::CBMPackage_packageVersion;
! *packageSize = *CBMc::CBMPackage_packageSize;
! *packageComments = *CBMc::CBMPackage_packageComments;
! *localPackageName = *CBMc::CBMPackage_localPackageName;
! *language = *CBMc::CBMPackage_language;
! *license = *CBMc::CBMPackage_license;
! *homePage = *CBMc::CBMPackage_homePage;
! *author = *CBMc::CBMPackage_author;
! *localPackageAbsoluteName = *CBMc::CBMPackage_localPackageAbsoluteName;
! *localPackageAbsoluteDirectory = *CBMc::CBMPackage_localPackageAbsoluteDirectory;
! *extractDirectory = *CBMc::CBMPackage_extractDirectory;
! *hasTest = *CBMc::CBMPackage_hasTest;
! *downloadURL = *CBMc::CBMPackage_downloadURL;
! *benchmarkSize = *CBMc::CBMPackage_benchmarkSize;
! *ContextMatches = *CBMc::CBMPackage_ContextMatches;
! *Download = *CBMc::CBMPackage_Download;
! *Extract = *CBMc::CBMPackage_Extract;
! *Patch = *CBMc::CBMPackage_Patch;
! *PreConfigure = *CBMc::CBMPackage_PreConfigure;
! *Configure = *CBMc::CBMPackage_Configure;
! *Make = *CBMc::CBMPackage_Make;
! *Test = *CBMc::CBMPackage_Test;
! *Release = *CBMc::CBMPackage_Release;
! *Install = *CBMc::CBMPackage_Install;
! *Fetch = *CBMc::CBMPackage_Fetch;
! *Uninstall = *CBMc::CBMPackage_Uninstall;
! *getStatus = *CBMc::CBMPackage_getStatus;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
--- 217,232 ----
  
  
! ############# Class : CBM::Benchmark ##############
  
! package CBM::Benchmark;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
  %OWNER = ();
  %ITERATORS = ();
! *Package = *CBMc::Benchmark_Package;
! *display = *CBMc::Benchmark_display;
! *benchmarkName = *CBMc::Benchmark_benchmarkName;
! *benchmarkComments = *CBMc::Benchmark_benchmarkComments;
! *Bench = *CBMc::Benchmark_Bench;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
***************
*** 334,338 ****
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CBMPackage($self);
          delete $OWNER{$self};
      }
--- 235,239 ----
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_Benchmark($self);
          delete $OWNER{$self};
      }
***************
*** 352,378 ****
  
  
! ############# Class : CBM::CBMBenchmark ##############
  
! package CBM::CBMBenchmark;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
  %OWNER = ();
! %ITERATORS = ();
! *Package = *CBMc::CBMBenchmark_Package;
! *display = *CBMc::CBMBenchmark_display;
! *benchmarkName = *CBMc::CBMBenchmark_benchmarkName;
! *benchmarkComments = *CBMc::CBMBenchmark_benchmarkComments;
! *Bench = *CBMc::CBMBenchmark_Bench;
! sub DESTROY {
!     return unless $_[0]->isa('HASH');
!     my $self = tied(%{$_[0]});
!     return unless defined $self;
!     delete $ITERATORS{$self};
!     if (exists $OWNER{$self}) {
!         CBMc::delete_CBMBenchmark($self);
!         delete $OWNER{$self};
!     }
! }
! 
  sub DISOWN {
      my $self = shift;
--- 253,306 ----
  
  
! ############# Class : CBM::System ##############
  
! package CBM::System;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
  %OWNER = ();
! *Root = *CBMc::System_Root;
! *HostDep = *CBMc::System_HostDep;
! *Extract = *CBMc::System_Extract;
! *Patches = *CBMc::System_Patches;
! *OS = *CBMc::System_OS;
! *Download = *CBMc::System_Download;
! *Status = *CBMc::System_Status;
! *Configuration = *CBMc::System_Configuration;
! *init = *CBMc::System_init;
! *hostid = *CBMc::System_hostid;
! *hostname = *CBMc::System_hostname;
! *os = *CBMc::System_os;
! *os_version = *CBMc::System_os_version;
! *processor_name = *CBMc::System_processor_name;
! *processor_mhz = *CBMc::System_processor_mhz;
! *processor_cache = *CBMc::System_processor_cache;
! *processor_number = *CBMc::System_processor_number;
! *arch = *CBMc::System_arch;
! *packageList = *CBMc::System_packageList;
! *packageNumber = *CBMc::System_packageNumber;
! *Package = *CBMc::System_Package;
! *Benchmark = *CBMc::System_Benchmark;
! *displayAllPackages = *CBMc::System_displayAllPackages;
! *displayAllBenchmarks = *CBMc::System_displayAllBenchmarks;
! *Split = *CBMc::System_Split;
! *Chomp = *CBMc::System_Chomp;
! *display = *CBMc::System_display;
! *displayPrograms = *CBMc::System_displayPrograms;
! *exec = *CBMc::System_exec;
! *md5 = *CBMc::System_md5;
! *md5File = *CBMc::System_md5File;
! *download = *CBMc::System_download;
! *copy = *CBMc::System_copy;
! *mkdir = *CBMc::System_mkdir;
! *checkDirectory = *CBMc::System_checkDirectory;
! *temporaryDirectory = *CBMc::System_temporaryDirectory;
! *unlink = *CBMc::System_unlink;
! *store = *CBMc::System_store;
! *read = *CBMc::System_read;
! *fileExists = *CBMc::System_fileExists;
! *Time = *CBMc::System_Time;
! *done = *CBMc::System_done;
! *getLastCommand = *CBMc::System_getLastCommand;
! *getLastCommandOutput = *CBMc::System_getLastCommandOutput;
  sub DISOWN {
      my $self = shift;
***************
*** 388,404 ****
  
  
! ############# Class : CBM::CBMCompiler ##############
  
! package CBM::CBMCompiler;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
  %OWNER = ();
  %ITERATORS = ();
! *display = *CBMc::CBMCompiler_display;
! *compiler = *CBMc::CBMCompiler_compiler;
! *compilerName = *CBMc::CBMCompiler_compilerName;
! *compilerVersion = *CBMc::CBMCompiler_compilerVersion;
! *Binary = *CBMc::CBMCompiler_Binary;
! *language = *CBMc::CBMCompiler_language;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
--- 316,332 ----
  
  
! ############# Class : CBM::Compiler ##############
  
! package CBM::Compiler;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
  %OWNER = ();
  %ITERATORS = ();
! *display = *CBMc::Compiler_display;
! *compiler = *CBMc::Compiler_compiler;
! *compilerName = *CBMc::Compiler_compilerName;
! *compilerVersion = *CBMc::Compiler_compilerVersion;
! *Binary = *CBMc::Compiler_Binary;
! *language = *CBMc::Compiler_language;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
***************
*** 407,411 ****
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CBMCompiler($self);
          delete $OWNER{$self};
      }
--- 335,339 ----
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_Compiler($self);
          delete $OWNER{$self};
      }
***************
*** 425,431 ****
  
  
! ############# Class : CBM::CBMCompilerSelector ##############
  
! package CBM::CBMCompilerSelector;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
--- 353,359 ----
  
  
! ############# Class : CBM::CompilerSelector ##############
  
! package CBM::CompilerSelector;
  use vars qw(@ISA %OWNER %ITERATORS %BLESSEDMEMBERS);
  @ISA = qw( CBM );
***************
*** 434,442 ****
  sub new {
      my $pkg = shift;
!     my $self = CBMc::new_CBMCompilerSelector(@_);
      bless $self, $pkg if defined($self);
  }
  
! *select = *CBMc::CBMCompilerSelector_select;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
--- 362,370 ----
  sub new {
      my $pkg = shift;
!     my $self = CBMc::new_CompilerSelector(@_);
      bless $self, $pkg if defined($self);
  }
  
! *select = *CBMc::CompilerSelector_select;
  sub DESTROY {
      return unless $_[0]->isa('HASH');
***************
*** 445,449 ****
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CBMCompilerSelector($self);
          delete $OWNER{$self};
      }
--- 373,377 ----
      delete $ITERATORS{$self};
      if (exists $OWNER{$self}) {
!         CBMc::delete_CompilerSelector($self);
          delete $OWNER{$self};
      }
***************
*** 467,516 ****
  package CBM;
  
- *CBM_PROG_BZIP2 = *CBMc::CBM_PROG_BZIP2;
- *CBM_PROG_CAT = *CBMc::CBM_PROG_CAT;
- *CBM_PROG_CP = *CBMc::CBM_PROG_CP;
- *CBM_PROG_CUT = *CBMc::CBM_PROG_CUT;
- *CBM_PROG_DD = *CBMc::CBM_PROG_DD;
- *CBM_PROG_DIALOG = *CBMc::CBM_PROG_DIALOG;
- *CBM_PROG_GREP = *CBMc::CBM_PROG_GREP;
- *CBM_PROG_GZIP = *CBMc::CBM_PROG_GZIP;
- *CBM_PROG_HEAD = *CBMc::CBM_PROG_HEAD;
- *CBM_PROG_MAKE = *CBMc::CBM_PROG_MAKE;
- *CBM_PROG_MKDIR = *CBMc::CBM_PROG_MKDIR;
- *CBM_PROG_PATCH = *CBMc::CBM_PROG_PATCH;
- *CBM_PROG_PERL = *CBMc::CBM_PROG_PERL;
- *CBM_PROG_RM = *CBMc::CBM_PROG_RM;
- *CBM_PROG_TAIL = *CBMc::CBM_PROG_TAIL;
- *CBM_PROG_TAR = *CBMc::CBM_PROG_TAR;
- *CBM_PROG_UNZIP = *CBMc::CBM_PROG_UNZIP;
- *CBM_PROG_WGET = *CBMc::CBM_PROG_WGET;
- *CBM_PROG_ZCAT = *CBMc::CBM_PROG_ZCAT;
- *CBM_SYSTEM_CYGWIN = *CBMc::CBM_SYSTEM_CYGWIN;
- *CBM_SYSTEM_FREEBSD = *CBMc::CBM_SYSTEM_FREEBSD;
- *CBM_SYSTEM_LINUX = *CBMc::CBM_SYSTEM_LINUX;
- *HAVE_CTYPE_H = *CBMc::HAVE_CTYPE_H;
- *HAVE_DIRENT_H = *CBMc::HAVE_DIRENT_H;
- *HAVE_DLFCN_H = *CBMc::HAVE_DLFCN_H;
- *HAVE_GETOPT_H = *CBMc::HAVE_GETOPT_H;
- *HAVE_INTTYPES_H = *CBMc::HAVE_INTTYPES_H;
- *HAVE_LIBDL = *CBMc::HAVE_LIBDL;
- *HAVE_MEMORY_H = *CBMc::HAVE_MEMORY_H;
- *HAVE_STDINT_H = *CBMc::HAVE_STDINT_H;
- *HAVE_STDLIB_H = *CBMc::HAVE_STDLIB_H;
- *HAVE_STRINGS_H = *CBMc::HAVE_STRINGS_H;
- *HAVE_STRING_H = *CBMc::HAVE_STRING_H;
- *HAVE_SYS_STAT_H = *CBMc::HAVE_SYS_STAT_H;
- *HAVE_SYS_TYPES_H = *CBMc::HAVE_SYS_TYPES_H;
- *HAVE_TIME_H = *CBMc::HAVE_TIME_H;
- *HAVE_UNISTD_H = *CBMc::HAVE_UNISTD_H;
- *PACKAGE = *CBMc::PACKAGE;
- *PACKAGE_BUGREPORT = *CBMc::PACKAGE_BUGREPORT;
- *PACKAGE_NAME = *CBMc::PACKAGE_NAME;
- *PACKAGE_STRING = *CBMc::PACKAGE_STRING;
- *PACKAGE_TARNAME = *CBMc::PACKAGE_TARNAME;
- *PACKAGE_VERSION = *CBMc::PACKAGE_VERSION;
- *PREFIX = *CBMc::PREFIX;
- *STDC_HEADERS = *CBMc::STDC_HEADERS;
- *VERSION = *CBMc::VERSION;
  *H_CBMLIBCOMPBENCHMARKS = *CBMc::H_CBMLIBCOMPBENCHMARKS;
  *libcompbenchmarks_version = *CBMc::libcompbenchmarks_version;
--- 395,398 ----
***************
*** 521,526 ****
  
  my %__cbmSystem_hash;
! tie %__cbmSystem_hash,"CBM::CBMSystem", $CBMc::cbmSystem;
  $cbmSystem= \%__cbmSystem_hash;
! bless $cbmSystem, CBM::CBMSystem;
  1;
--- 403,408 ----
  
  my %__cbmSystem_hash;
! tie %__cbmSystem_hash,"CBM::System", $CBMc::cbmSystem;
  $cbmSystem= \%__cbmSystem_hash;
! bless $cbmSystem, CBM::System;
  1;

Index: Glue.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Glue.cpp	10 Jan 2007 20:27:58 -0000	1.4
--- Glue.cpp	21 Jan 2007 20:47:56 -0000	1.5
***************
*** 14,27 ****
  CBM_SYSTEM *sys;
  
! CBM_SYSTEM *Init(void)
  {
    sys = new CBM_SYSTEM;
!   UO_verbose=0;
!   UO_fatal=0;
    sys->init();
    return(sys);
  }
  
! std::string & stringref(char *str)
  {
    std::string *dum = new std::string(str);
--- 14,27 ----
  CBM_SYSTEM *sys;
  
! CBM::System *Init(void)
  {
    sys = new CBM_SYSTEM;
!   CBM::UO_verbose=0;
!   CBM::UO_fatal=0;
    sys->init();
    return(sys);
  }
  
! std::string &stringref(char *str)
  {
    std::string *dum = new std::string(str);

Index: CBM.i
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CBM.i	17 Jan 2007 19:21:17 -0000	1.4
--- CBM.i	21 Jan 2007 20:47:56 -0000	1.5
***************
*** 2,53 ****
  
  %module CBM
!  %{
     #include "libcompbenchmarks.h"
     #include "Glue.h"
-  %}
- 
- %module CBMXML
-  %{
-    #include "System/XML.h"
-  %}
- 
- %module CBMSystem
-  %{
     #include "System/System.h"
-  %}
- 
- %module CBMSystemUnix
-  %{
-    #include "System/System-Unix.h"
-  %}
- 
- %module CBMSystemLinux
-  %{	
-    #include "System/System-Linux.h"
-  %}
- 
- %module CBMPackage
-  %{
     #include "Benchmark/Package.h"
-  %}
- 
- %module CBMBenchmark
-  %{	
     #include "Benchmark/Benchmark.h"
-  %}
- 
- %module CBMCompiler
-  %{	
     #include "Compiler/Compiler.h"
!  %}
  
- %include "config.h"
  %include "libcompbenchmarks.h"
- %include "System/System.h"
  %include "System/XML.h"
- %include "System/System-Unix.h"
- %include "System/System-Linux.h"
  %include "Benchmark/Package.h"
  %include "Benchmark/Benchmark.h"
  %include "Compiler/Compiler.h"
! %include "Glue.h"
--- 2,21 ----
  
  %module CBM
! %{
     #include "libcompbenchmarks.h"
     #include "Glue.h"
     #include "System/System.h"
     #include "Benchmark/Package.h"
     #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"
! %include "Glue.h"
\ No newline at end of file

Index: CBM_wrap.cxx
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/CBM_wrap.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CBM_wrap.cxx	17 Jan 2007 19:21:17 -0000	1.7
--- CBM_wrap.cxx	21 Jan 2007 20:47:56 -0000	1.8
***************
*** 1380,1393 ****
  /* -------- TYPES TABLE (BEGIN) -------- */
  
! #define SWIGTYPE_p_CBMBenchmark swig_types[0]
! #define SWIGTYPE_p_CBMCompiler swig_types[1]
! #define SWIGTYPE_p_CBMCompilerOptions swig_types[2]
! #define SWIGTYPE_p_CBMCompilerSelector swig_types[3]
! #define SWIGTYPE_p_CBMPackage swig_types[4]
! #define SWIGTYPE_p_CBMSystem swig_types[5]
! #define SWIGTYPE_p_CBMSystemLinux swig_types[6]
! #define SWIGTYPE_p_CBMSystemUnix swig_types[7]
[...9645 lines suppressed...]
    /*@SWIG:%set_constant@*/ do {
!     SV *sv = get_sv((char*) SWIG_prefix "System_Download", TRUE | 0x2);
!     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Download)));
      SvREADONLY_on(sv);
    } while(0) /*@SWIG@*/;
    /*@SWIG:%set_constant@*/ do {
!     SV *sv = get_sv((char*) SWIG_prefix "System_Status", TRUE | 0x2);
!     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Status)));
      SvREADONLY_on(sv);
    } while(0) /*@SWIG@*/;
    /*@SWIG:%set_constant@*/ do {
!     SV *sv = get_sv((char*) SWIG_prefix "System_Configuration", TRUE | 0x2);
!     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast<int >(CBM::System::Configuration)));
      SvREADONLY_on(sv);
    } while(0) /*@SWIG@*/;
!   SWIG_TypeClientData(SWIGTYPE_p_CBM__System, (void*) "CBM::System");
!   SWIG_TypeClientData(SWIGTYPE_p_CBM__Compiler, (void*) "CBM::Compiler");
!   SWIG_TypeClientData(SWIGTYPE_p_CBM__CompilerSelector, (void*) "CBM::CompilerSelector");
    ST(0) = &PL_sv_yes;
    XSRETURN(1);

Index: Glue.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Glue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Glue.h	4 Jan 2007 19:37:29 -0000	1.2
--- Glue.h	21 Jan 2007 20:47:56 -0000	1.3
***************
*** 14,18 ****
  #include <Benchmark/Benchmark.h>
  
! extern CBM_SYSTEM *Init(void);
  
  extern std::string & stringref(char *str);
--- 14,18 ----
  #include <Benchmark/Benchmark.h>
  
! extern CBM::System *Init(void);
  
  extern std::string & stringref(char *str);