Re: intltool 0.27 is available

Abel Cheung <[email protected]> Tue, 12 Aug 2003 05:24:41 +0800
Newsgroups gmane.comp.gnome.lib.xml.internationalization
Message-ID <[email protected]>
--bpVaumkpfGNUagdU
Content-Type: multipart/mixed; boundary="Zrag5V6pnZGjLKiw"
Content-Disposition: inline


--Zrag5V6pnZGjLKiw
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 2003-08-11(Mon) 21:45:39 +0200, Carlos Perell=C3=B3 Mar=C3=ADn wrote:
> A new release of the intltool package is available; this time codenamed
[.......]
> - Added support for .xam files (Abel Cheung)

I forgot to add AC_SUBST(INTLTOOL_XAM_RULE) into intltool.m4. Just
committed.

Seems that one patch is forgotten; it's not that critical (as compared
with UTF-8 strings), but would be more helpful for translators. In case
some files listed in POTFILES.in do not exist, intltool-update -m would
try to pre-announce that. Patch attached.

Abel


> - Updated I18N-HOWTO (Kenneth, Bruno Haible)
> - Updated all manual pages and command help (Abel Cheung)
> - Improved the package name detection code (Abel Cheung)
> - better .server files handling (Abel Cheung)
> - source code with non-ASCII chars support with
>   GNU gettext 0.12 (bug #99005, Abel Cheung, Carlos Perell=C3=B3 Mar=C3=
=ADn)
> - intltool-unicodify is deprecated, please use msgconv (Abel Cheung)
>=20
> You can find the source code for intltool 0.27 on GNOME FTP site:
>=20
>     <ftp://ftp.gnome.org/pub/GNOME/sources/intltool/0.27/>
>=20
> If you have problems with intltool, please report bugs at
> bugzilla.gnome.org. And if you are good at auto*, perl then please take
> a look at the hard-to-fix bugs.
>=20
> --=20
> Carlos Perell=C3=B3 Mar=C3=ADn
> Debian GNU/Linux Sid (PowerPC)
> Linux Registered User #121232
> mailto:[email protected] || mailto:[email protected]
> http://carlos.pemas.net
> Valencia - Spain
>=20
> _______________________________________________
> gnome-i18n mailing list
> [email protected]
> http://lists.gnome.org/mailman/listinfo/gnome-i18n

--=20
Abel Cheung
Linux counter #256983   | http://counter.li.org
GPG Key: (0xC67186FF)   | http://deaddog.org/gpg.asc
Key fingerprint: 671C C7AE EFB5 110C D6D1  41EE 4152 E1F1 C671 86FF

--Zrag5V6pnZGjLKiw
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="intltool-remaining.patch"
Content-Transfer-Encoding: quoted-printable

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/gnome/intltool/ChangeLog,v
retrieving revision 1.326
diff -u -r1.326 ChangeLog
--- ChangeLog	11 Aug 2003 20:44:07 -0000	1.326
+++ ChangeLog	11 Aug 2003 21:19:11 -0000
@@ -1,5 +1,14 @@
 2003-08-11  Abel Cheung  <[email protected]>
=20
+	* intltool-update.in.in:
+	Warn users if files in POTFILES.* do not exist, and write the file
+	list to `./notexist'.
+	Don't traverse source directory several times in "find sub{}".
+	Prefer configure.ac to configure.in when searching for autoconf file,
+	since the majority of people has been moving to autoconf 2.5x.
+
+2003-08-11  Abel Cheung  <[email protected]>
+
 	* intltool.m4: Fix broken support of .xam makefile rule.
=20
 =3D=3D=3D intltool 0.27 =3D=3D=3D
Index: intltool-update.in.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/gnome/intltool/intltool-update.in.in,v
retrieving revision 1.88
diff -u -r1.88 intltool-update.in.in
--- intltool-update.in.in	11 Aug 2003 19:32:39 -0000	1.88
+++ intltool-update.in.in	11 Aug 2003 21:19:12 -0000
@@ -284,16 +284,10 @@
=20
     ## Search and find all translatable files
     find sub {=20
-	push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$=
/=20
-	}, "..";
-    find sub {
-	push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/=20
-	}, "..";
-    find sub {
-	push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/=20
-	}, "..";
-    find sub {
-	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/
+	push @buf_i18n_plain,        "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|=
h|gob)$/;
+	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_extension)$/;
+	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_extension)$/;
+	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
 	}, "..";
=20
=20
@@ -451,20 +445,47 @@
 	}
     }
=20
+    my @buf_potfiles_notexist;
+
+    foreach (@buf_potfiles_sorted)
+    {
+	chomp (my $dummy =3D $_);
+	if ("$dummy" ne "" and ! -f "../$dummy")
+	{
+	    push @buf_potfiles_notexist, $_;
+	}
+    }
+
     ## Save file with information about the files missing
     ## if any, and give information about this procedure.
-    if (@result)=20
+    if (@result + @buf_potfiles_notexist > 0)
     {
-	print "\n" if $VERBOSE;
-	unlink "missing";
-	open OUT, ">missing";
-	print OUT @result;
-	print STDERR "The following files contain translations and are currently =
not in use. Please\n";
-	print STDERR "consider adding these to the POTFILES.in file, located in t=
he po/ directory.\n\n";
-	print STDERR @result, "\n";
-	print STDERR "If some of these files are left out on purpose then please =
add them to\n";
-	print STDERR "POTFILES.skip instead of POTFILES.in. A file 'missing' cont=
aining this list\n";
-	print STDERR "of left out files has been written in the current directory=
.\n";
+	if (@result)=20
+	{
+	    print "\n" if $VERBOSE;
+	    unlink "missing";
+	    open OUT, ">missing";
+	    print OUT @result;
+	    close OUT;
+	    warn "\e[1mThe following files contain translations and are currently=
 not in use. Please\e[0m\n".
+	         "\e[1mconsider adding these to the POTFILES.in file, located in =
the po/ directory.\e[0m\n\n";
+	    print STDERR @result, "\n";
+	    warn "If some of these files are left out on purpose then please add =
them to\n".
+		 "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m conta=
ining this list\n".
+		 "of left out files has been written in the current directory.\n";
+	}
+	if (@buf_potfiles_notexist)
+	{
+	    unlink "notexist";
+	    open OUT, ">notexist";
+	    print OUT @buf_potfiles_notexist;
+	    close OUT;
+	    warn "\n" if ($VERBOSE or @result);
+	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
+	    warn @buf_potfiles_notexist, "\n";
+	    warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e=
[1m'notexist'\e[0m\n".
+		 "containing this list of absent files has been written in the current d=
irectory.\n";
+	}
     }
=20
     ## If there is nothing to complain about, notify the user
@@ -807,13 +828,13 @@
=20
     if ($base_dirname =3D~ /^po(-.+)?$/)=20
     {
-	if (-f "../configure.in")=20
+	if (-f "../configure.ac")=20
 	{
-	    $conf_in =3D "../configure.in";
+	    $conf_in =3D "../configure.ac";
 	}=20
-	elsif (-f "../configure.ac")=20
+	elsif (-f "../configure.in")=20
 	{
-	    $conf_in =3D "../configure.ac";
+	    $conf_in =3D "../configure.in";
 	}=20
 	else=20
 	{
@@ -860,6 +881,7 @@
 	seek (IN, 0, 0);
 	local $/; # slurp mode
 	$conf_source =3D <IN>;
+	close IN;
     }
=20
     my $name =3D "untitled";

--Zrag5V6pnZGjLKiw--

--bpVaumkpfGNUagdU
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)

iD8DBQE/OAmYQVLh8cZxhv8RAuEtAKDL7GiNssFuzc6rayYQ7fvnIsIpNACfTTZZ
UGBRiyqcQb0cXVYGUQkmQIQ=
=VS2M
-----END PGP SIGNATURE-----

--bpVaumkpfGNUagdU--