Re: Could not run generate_unaccent_rules.py script when update unicode
Japin Li <japinli@hotmail.com>
From: Japin Li <japinli@hotmail.com>
To: Michael Paquier <michael@paquier.xyz>
Cc: "pgsql-hackers@lists.postgresql.org" <pgsql-hackers@lists.postgresql.org>
Date: 2023-09-27T01:15:00Z
Lists: pgsql-hackers
On Wed, 27 Sep 2023 at 08:03, Michael Paquier <michael@paquier.xyz> wrote: > On Tue, Sep 26, 2023 at 10:43:40AM +0800, Japin Li wrote: >> # Allow running this even without --with-python >> PYTHON ?= python >> >> $(srcdir)/unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml >> $(PYTHON) $< --unicode-data-file $(word 2,$^) --latin-ascii-file $(word 3,$^) >$@ >> >> It use python to run generate_unaccent_rules.py, However, the ?= operator in >> Makefile only check variable is defined or not, but do not check variable is >> empty. Since the PYTHON is defined in src/Makefile.global, so here PYTHON >> get empty when without --with-ptyhon. > > I am not sure that many people run this script frequently so that may > not be worth adding a check for a defined, still empty or incorrect Yeah, not frequently, however, it already be used by me, since we provide this function, why not make it better? > value, but.. If you were to change the Makefile we use in this path, > how are you suggesting to change it? I provide a patch at bottom of in [1]. Attached here again. diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile index 652a3e774c..3ff49ba1e9 100644 --- a/contrib/unaccent/Makefile +++ b/contrib/unaccent/Makefile @@ -26,7 +26,9 @@ endif update-unicode: $(srcdir)/unaccent.rules # Allow running this even without --with-python -PYTHON ?= python +ifeq ($(PYTHON),) +PYTHON = python +endif $(srcdir)/unaccent.rules: generate_unaccent_rules.py ../../src/common/unicode/UnicodeData.txt Latin-ASCII.xml $(PYTHON) $< --unicode-data-file $(word 2,$^) --latin-ascii-file $(word 3,$^) >$@ [1] https://www.postgresql.org/message-id/MEYP282MB1669F86C0DC7B4DC48489CB0B6C3A@MEYP282MB1669.AUSP282.PROD.OUTLOOK.COM -- Regrads, Japin Li ChengDu WenWu Information Technology Co., Ltd.
Commits
-
unaccent: Tweak value of PYTHON when building without Python support
- a64b8b03556a 13.13 landed
- e4d7ad30f0aa 14.10 landed
- 8a9e4e84e3cf 15.5 landed
- 641db601b72f 16.1 landed
- 6fc3a138b1e8 17.0 landed