From c8a9246e09cc2786923df8e5abf3c9c317f3493c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 18 Jul 2022 12:18:36 -0700 Subject: [PATCH] Add output directory argument to generate-unicode_norm_table.pl This is in preparation for building postgres with meson / ninja. When building with meson, commands are run at the root of the build tree. Add an option to put build output into the appropriate place. Author: Andres Freund Author: Peter Eisentraut Author: Nazir Bilal Yavuz Discussion: https://postgr.es/m/5e216522-ba3c-f0e6-7f97-5276d0270029@enterprisedb.com --- .../unicode/generate-unicode_norm_table.pl | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/common/unicode/generate-unicode_norm_table.pl b/src/common/unicode/generate-unicode_norm_table.pl index e4423455fc..95c89282bb 100644 --- a/src/common/unicode/generate-unicode_norm_table.pl +++ b/src/common/unicode/generate-unicode_norm_table.pl @@ -10,20 +10,27 @@ use strict; use warnings; +use Getopt::Long; use FindBin; use lib "$FindBin::RealBin/../../tools/"; use PerfectHash; -my $output_table_file = "unicode_norm_table.h"; -my $output_func_file = "unicode_norm_hashfunc.h"; +my $output_path = '.'; + +GetOptions( + 'outdir:s' => \$output_path); + +my $output_table_file = "$output_path/unicode_norm_table.h"; +my $output_func_file = "$output_path/unicode_norm_hashfunc.h"; + my $FH; # Read list of codes that should be excluded from re-composition. my @composition_exclusion_codes = (); -open($FH, '<', "CompositionExclusions.txt") - or die "Could not open CompositionExclusions.txt: $!."; +open($FH, '<', "$output_path/CompositionExclusions.txt") + or die "Could not open $output_path/CompositionExclusions.txt: $!."; while (my $line = <$FH>) { if ($line =~ /^([[:xdigit:]]+)/) @@ -38,8 +45,8 @@ close $FH; # and character decomposition mapping my @characters = (); my %character_hash = (); -open($FH, '<', "UnicodeData.txt") - or die "Could not open UnicodeData.txt: $!."; +open($FH, '<', "$output_path/UnicodeData.txt") + or die "Could not open $output_path/UnicodeData.txt: $!."; while (my $line = <$FH>) { -- 2.39.5