[Ltp-cvs] utils/analysis/lcov/bin genhtml, 1.61, 1.62 geninfo, 1.105, 1.106 lcov, 1.86, 1.87

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory vz-cvs-4.sog:/tmp/cvs-serv1698

Modified Files:
	genhtml geninfo lcov 
Log Message:
lcov: fix problems with --rc option

Fix error "Invalid option linkage for \"rc=s%\"" when running lcov
with an older version of the Getopt::Long module. Also pass --rc
options through lcov to geninfo.


Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** geninfo	24 Jul 2012 15:41:38 -0000	1.105
--- geninfo	24 Aug 2012 11:43:18 -0000	1.106
***************
*** 244,248 ****
  our $opt_gcov_all_blocks = 1;
  our $opt_compat;
! our $opt_rc;
  our %compat_value;
  our $gcno_split_crc;
--- 244,248 ----
  our $opt_gcov_all_blocks = 1;
  our $opt_compat;
! our %opt_rc;
  our %compat_value;
  our $gcno_split_crc;
***************
*** 270,274 ****
  Getopt::Long::Configure("pass_through", "no_auto_abbrev");
  GetOptions("config-file=s" => \$opt_config_file,
! 	   "rc=s%" => \$opt_rc);
  Getopt::Long::Configure("default");
  
--- 270,274 ----
  Getopt::Long::Configure("pass_through", "no_auto_abbrev");
  GetOptions("config-file=s" => \$opt_config_file,
! 	   "rc=s%" => \%opt_rc);
  Getopt::Long::Configure("default");
  
***************
*** 285,289 ****
  }
  
! if ($config || $opt_rc)
  {
  	# Copy configuration file and --rc values to variables
--- 285,289 ----
  }
  
! if ($config || %opt_rc)
  {
  	# Copy configuration file and --rc values to variables
***************
*** 352,356 ****
  		"compat=s" => \$opt_compat,
  		"config-file=s" => \$opt_config_file,
! 		"rc=s%" => \$opt_rc,
  		))
  {
--- 352,356 ----
  		"compat=s" => \$opt_compat,
  		"config-file=s" => \$opt_config_file,
! 		"rc=s%" => \%opt_rc,
  		))
  {
***************
*** 2011,2016 ****
  	foreach (keys(%{$ref}))
  	{
! 		if (defined($opt_rc->{$_})) {
! 			${$ref->{$_}} = $opt_rc->{$_};
  		} elsif (defined($config->{$_})) {
  			${$ref->{$_}} = $config->{$_};
--- 2011,2016 ----
  	foreach (keys(%{$ref}))
  	{
! 		if (defined($opt_rc{$_})) {
! 			${$ref->{$_}} = $opt_rc{$_};
  		} elsif (defined($config->{$_})) {
  			${$ref->{$_}} = $config->{$_};

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** genhtml	19 Jul 2012 13:12:35 -0000	1.61
--- genhtml	24 Aug 2012 11:43:18 -0000	1.62
***************
*** 291,295 ****
  our @ignore;
  our $opt_config_file;	# User-specified configuration file location
! our $opt_rc;
  our $charset = "UTF-8";	# Default charset for HTML pages
  our @fileview_sortlist;
--- 291,295 ----
  our @ignore;
  our $opt_config_file;	# User-specified configuration file location
! our %opt_rc;
  our $charset = "UTF-8";	# Default charset for HTML pages
  our @fileview_sortlist;
***************
*** 323,327 ****
  Getopt::Long::Configure("pass_through", "no_auto_abbrev");
  GetOptions("config-file=s" => \$opt_config_file,
! 	   "rc=s%" => \$opt_rc);
  Getopt::Long::Configure("default");
  
--- 323,327 ----
  Getopt::Long::Configure("pass_through", "no_auto_abbrev");
  GetOptions("config-file=s" => \$opt_config_file,
! 	   "rc=s%" => \%opt_rc);
  Getopt::Long::Configure("default");
  
***************
*** 338,342 ****
  }
  
! if ($config || $opt_rc)
  {
  	# Copy configuration file and --rc values to variables
--- 338,342 ----
  }
  
! if ($config || %opt_rc)
  {
  	# Copy configuration file and --rc values to variables
***************
*** 408,412 ****
  		"ignore-errors=s"	=> \@opt_ignore_errors,
  		"config-file=s"		=> \$opt_config_file,
! 		"rc=s%"			=> \$opt_rc,
  		))
  {
--- 408,412 ----
  		"ignore-errors=s"	=> \@opt_ignore_errors,
  		"config-file=s"		=> \$opt_config_file,
! 		"rc=s%"			=> \%opt_rc,
  		))
  {
***************
*** 5586,5591 ****
  	foreach (keys(%{$ref}))
  	{
! 		if (defined($opt_rc->{$_})) {
! 			${$ref->{$_}} = $opt_rc->{$_};
  		} elsif (defined($config->{$_})) {
  			${$ref->{$_}} = $config->{$_};
--- 5586,5591 ----
  	foreach (keys(%{$ref}))
  	{
! 		if (defined($opt_rc{$_})) {
! 			${$ref->{$_}} = $opt_rc{$_};
  		} elsif (defined($config->{$_})) {
  			${$ref->{$_}} = $config->{$_};

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** lcov	19 Jul 2012 13:12:35 -0000	1.86
--- lcov	24 Aug 2012 11:43:18 -0000	1.87
***************
*** 192,196 ****
  our $opt_no_external;
  our $opt_config_file;
! our $opt_rc;
  our @opt_summary;
  our $opt_compat;
--- 192,196 ----
  our $opt_no_external;
  our $opt_config_file;
! our %opt_rc;
  our @opt_summary;
  our $opt_compat;
***************
*** 224,228 ****
  Getopt::Long::Configure("pass_through", "no_auto_abbrev");
  GetOptions("config-file=s" => \$opt_config_file,
! 	   "rc=s%" => \$opt_rc);
  Getopt::Long::Configure("default");
  
--- 224,228 ----
  Getopt::Long::Configure("pass_through", "no_auto_abbrev");
  GetOptions("config-file=s" => \$opt_config_file,
! 	   "rc=s%" => \%opt_rc);
  Getopt::Long::Configure("default");
  
***************
*** 239,243 ****
  }
  
! if ($config || $opt_rc)
  {
  	# Copy configuration file and --rc values to variables
--- 239,243 ----
  }
  
! if ($config || %opt_rc)
  {
  	# Copy configuration file and --rc values to variables
***************
*** 291,295 ****
  		"compat=s" => \$opt_compat,
  		"config-file=s" => \$opt_config_file,
! 		"rc=s%" => \$opt_rc,
  		))
  {
--- 291,295 ----
  		"compat=s" => \$opt_compat,
  		"config-file=s" => \$opt_config_file,
! 		"rc=s%" => \%opt_rc,
  		))
  {
***************
*** 870,873 ****
--- 870,879 ----
  		@param = (@param, "--compat", $opt_compat);
  	}
+ 	if (%opt_rc) {
+ 		foreach my $key (keys(%opt_rc)) {
+ 			@param = (@param, "--rc", "$key=".$opt_rc{$key});
+ 		}
+ 	}
+ 
  	system(@param) and exit($? >> 8);
  }
***************
*** 4083,4088 ****
  	foreach (keys(%{$ref}))
  	{
! 		if (defined($opt_rc->{$_})) {
! 			${$ref->{$_}} = $opt_rc->{$_};
  		} elsif (defined($config->{$_})) {
  			${$ref->{$_}} = $config->{$_};
--- 4089,4094 ----
  	foreach (keys(%{$ref}))
  	{
! 		if (defined($opt_rc{$_})) {
! 			${$ref->{$_}} = $opt_rc{$_};
  		} elsif (defined($config->{$_})) {
  			${$ref->{$_}} = $config->{$_};