Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix --srcdir handling #237

Merged
merged 4 commits into from
May 20, 2020
Merged

Fix --srcdir handling #237

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cf5889
po4a: Sort the readdir() result
guillemj May 20, 2020
0bfb5d3
po4a: Generate the directory for the .po file for the msgmerge call
guillemj May 18, 2020
13dcc72
po4a: Look for input files in calldir before srcdir
guillemj May 20, 2020
61b1241
po4a: Find the input .pot file for msgmerge in the srcdir too
guillemj May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions po4a
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ Set the base directory for all input documents specified in the B<po4a>
configuration file.

If both I<destdir> and I<srcdir> are specified, input files are
searched in the following directories, in order: I<destdir>,
I<srcdir> and the current directory. Output files are written to I<destdir> if
searched in the following directories, in order: I<destdir>, the current
directory and I<srcdir>. Output files are written to I<destdir> if
specified, or to the current directory.

=item B<--destdir> I<DESTDIR>
Expand Down Expand Up @@ -876,7 +876,7 @@ sub find_input_file {
my $debug = $_[1];
print STDERR "Search for input file $filename\n" if $debug;
return $filename if ( File::Spec->file_name_is_absolute($filename) );
foreach ( ( $destdir, $srcdir, $calldir ) ) {
foreach ( ( $destdir, $calldir, $srcdir ) ) {
next unless defined $_;
my $p = File::Spec->catfile( $_, $filename );
print STDERR "Test $p: " . ( -e $p ? "OK" : "nope" ) . "\n"
Expand Down Expand Up @@ -1054,7 +1054,7 @@ while (<CONFIG>) {
opendir PO_DIR, find_input_file($po_directory)
or die wrap_ref_mod( "$config_file:$nb", "", gettext("Cannot list the '%s' directory"), $po_directory );

foreach my $f ( readdir PO_DIR ) {
foreach my $f ( sort readdir PO_DIR ) {
next unless -f find_input_file("$po_directory/$f");
if ( $f =~ m/^(.*)\.po$/ ) {
push @langs, $1;
Expand Down Expand Up @@ -1510,9 +1510,13 @@ if ( not $po4a_opts{"no-update"} ) {
foreach $lang ( sort keys %po_filename ) {
my ( $infile, $outfile ) =
( find_input_file( $po_filename{$lang} ), find_output_file( $po_filename{$lang} ) );
my $updated_potfile = find_output_file($pot_filename);
my $updated_potfile = find_input_file($pot_filename);

if ( -e $infile ) {
my $dir = dirname( $outfile );
if ( not -d $dir ) {
mkdir $dir or die wrap_msg( gettext("Can't create directory '%s': %s"), $dir, $! );
}

my $msgmerge_opt = $po4a_opts{"msgmerge-opt"};
$msgmerge_opt =~ s/\$lang\b/$lang/g if scalar @langs;
Expand Down