refactor ABICompCheck to use nested configuration for binaries and flags, use config opts from config, remove some duplicate code

Author: MankiratSingh1315

PGBuild/Modules/ABICompCheck.pm

@@ -52,14 +52,14 @@ sub setup
 		$abi_compare_root = "$buildroot/abicheck";
 	}
 
-	my $binaries_rel_path = $conf->{binaries_rel_path}
+	my $binaries_rel_path = $conf->{abi_comp_check}->{binaries_rel_path}
 	  || {
 		'postgres' => 'bin/postgres',
 		'ecpg' => 'bin/ecpg',
 		'libpq.so' => 'lib/libpq.so',
 	  };
 
-	my $abidw_flags_list = $conf->{abidw_flags_list}
+	my $abidw_flags_list = $conf->{abi_comp_check}->{abidw_flags_list}
 	  || [
 		'--drop-undefined-syms', '--no-architecture', '--no-comp-dir-path',
 		'--no-elf-needed', '--no-show-locs', '--type-id-style',
@@ -240,24 +240,31 @@ sub _log_command_output
 
 sub _configure_make_and_build
 {
-	my ($self, $commit_hash) = @_;    # Added $commit_hash argument
+	my ($self, $commit_hash) = @_;
 	my $abi_compare_root = $self->{abi_compare_root};
-	my $clone_name = $self->{clone_name};
-	my $log_dir = "$abi_compare_root/logs/$commit_hash";
-	my $make = $self->{bfconf}->{make};
-	my $make_jobs = $self->{bfconf}->{make_jobs};
 	print time_str(),
 	  "Configuring, making, and installing for commit $commit_hash in ",
 	  __PACKAGE__, "\n"
 	  if $verbose;
 
-	chdir "$abi_compare_root/$clone_name"
+	chdir $abi_compare_root . '/' . $self->{clone_name}
 	  or die
-	  "Cannot change to PostgreSQL source directory: $abi_compare_root/$clone_name for commit $commit_hash";
+	  "Cannot change to PostgreSQL source directory: $abi_compare_root/$self->{clone_name} for commit $commit_hash";
+
+	my $log_dir = "$abi_compare_root/logs/$commit_hash";
+	my $make = $self->{bfconf}->{make};
+	my $make_jobs = $self->{bfconf}->{make_jobs};
+	my $config_opts = $self->{bfconf}->{config_opts} || [];
+
+	if (! grep { $_ eq '--enable-debug' } @$config_opts)
+	{
+		push @$config_opts, '--enable-debug';
+	}
+	my $configure_options = join(' ', @$config_opts);
 
-	_log_command_output($self,
-		qq{./configure --enable-debug --prefix=$abi_compare_root/install/},
-		$log_dir, 'configure');
+	my $cmdd=qq{./configure $configure_options --prefix=$abi_compare_root/install/};
+
+	_log_command_output($self, $cmdd, $log_dir, 'configure');
 	my $make_cmd = $make;
 	$make_cmd = "$make -j $make_jobs"
 	  if ($make_jobs > 1);
@@ -271,8 +278,7 @@ sub _configure_make_and_build
 sub _generate_abidw_xml
 {
 	my $self = shift;
-	my $abidw_flags_list = $self->{abidw_flags_list};
-	my $abidw_flags_str = join(' ', @$abidw_flags_list);
+	my $abidw_flags_str = join ' ', @{ $self->{abidw_flags_list} };
 	my $commit_hash = shift;
 
 	print time_str(), "Generating ABIDW XML for commit $commit_hash in ",
@@ -302,68 +308,41 @@ sub _generate_abidw_xml
 	}
 
 	my @targets_to_process = ();
-	foreach my $target_name (keys %$binaries_rel_path)
+	while (my ($target_name, $rel_path) = each %{ $binaries_rel_path })
 	{
-		my $input_path = "$install_dir/$binaries_rel_path->{$target_name}";
+		my $input_path = "$install_dir/$rel_path";
 		my $output_file = "$commit_xml_dir/$target_name.abi";
 
-		if (-e $input_path)
-		{
-			push @targets_to_process,
-			  {
-				name => $target_name,
-				input_path => $input_path,
-				output_file => $output_file,
-			  };
-		}
-		else
-		{
-			print time_str(),
-			  "Warning: Input file '$input_path' for $target_name not found. Skipping ABI generation for this target (commit $commit_hash).\n"
-			  if $verbose;
-		}
-	}
-
-	if (!@targets_to_process)
-	{
-		die "No valid targets found for ABI generation in commit $commit_hash.";
-	}
-
-	foreach my $target (@targets_to_process)
-	{
-		my $target_name = $target->{name};
-		my $input_file_path = $target->{input_path};
-		my $output_abi_file = $target->{output_file};
-
-		unless (-e $input_file_path && -f $input_file_path)
+		if (-e $input_path && -f $input_path)
 		{
-			print time_str(),
-			  "Warning: Input file '$input_file_path' for $target_name not found or is not a regular file. Skipping ABI generation for this target (commit $commit_hash).\n"
-			  if $verbose;
-			next;
-		}
-
-		my $cmd =
-		  qq{abidw --out-file "$output_abi_file" "$input_file_path" $abidw_flags_str};
-		print time_str(), "Executing: $cmd\n" if $verbose;
+			my $cmd = qq{abidw --out-file "$output_file" "$input_path" $abidw_flags_str};
+			print time_str(), "Executing: $cmd\n" if $verbose;
 
-		my @abidw_log = run_log($cmd);
-		my $exit_status = $? >> 8;
+			my @abidw_log = run_log($cmd);
+			my $exit_status = $? >> 8;
 
-		print_logs(\@abidw_log);
+			print_logs(\@abidw_log);
 
-		if ($exit_status)
-		{
-			die
-			  "abidw failed for $target_name (from $input_file_path) with status $exit_status. Commit: $commit_hash";
+			if ($exit_status)
+			{
+				die
+				"abidw failed for $target_name (from $input_path) with status $exit_status. Commit: $commit_hash";
+			}
+			else
+			{
+				print time_str(),
+				"Successfully generated ABI XML for $target_name to $output_file\n"
+				if $verbose;
+			}
 		}
 		else
 		{
 			print time_str(),
-			  "Successfully generated ABI XML for $target_name to $output_abi_file\n"
+			  "Warning: Input file '$input_path' for $target_name not found. Skipping ABI generation for this target (commit $commit_hash).\n"
 			  if $verbose;
 		}
 	}
+
 	return;
 }
 
@@ -551,14 +530,7 @@ sub print_logs
 {
 	my ($logss) = @_;
 
-	if (@$logss)
-	{
-		print "ABICompCheck:";
-		foreach my $line (@$logss)
-		{
-			print $line;
-		}
-	}
+	print "ABICompCheck: ", @$logss if @$logss;
 }
 
 sub install

build-farm.conf.sample

@@ -416,6 +416,15 @@ my $confdir = File::Spec->rel2abs(File::Basename::dirname(__FILE__));
 		#             },
 	},
 
+	abi_comp_check => {
+		# binaries_rel_path => {
+		# 	'postgres' => 'bin/postgres'
+		# },
+		# abidw_flags_list => [
+		# 	'--drop-undefined-syms'
+		# ]
+	}
+
 );