Hello,
On 14 Apr 2021, at 16:51, Valters Jansons valter.jansons@gmail.com wrote:
On Wed, Apr 14, 2021 at 6:20 PM Michael Tremer michael.tremer@ipfire.org wrote:
We have a command that automatically generates this file which would not respect this change:
make update-po
$ git clone git://git.ipfire.org/location/libloc.git $ cd libloc $ autoreconf --install --symlink $ intltoolize --force --automake $ ./configure --prefix=/usr --sysconfdir=/etc --libdir=/lib $ rm po/POTFILES.in && make po/POTFILES.in $ make update-po
For me this appears to produce the exact diff that has been provided in the v2 patch.
After running those commands I see the following diff which almost entirely reverts all changes in your patch:
root@michael:/build/libloc# git diff diff --git a/po/POTFILES.in b/po/POTFILES.in index 5d2cc46..9088986 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,10 +1,11 @@ src/libloc.pc.in -src/python/__init__.py.in src/python/database.py src/python/downloader.py src/python/export.py src/python/i18n.py src/python/importer.py +src/python/__init__.py +src/python/__init__.py.in src/python/location-importer.in src/python/location.in src/python/logger.py diff --git a/po/de.po b/po/de.po index 7083958..042e52a 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libloc 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-14 12:00+0000\n" +"POT-Creation-Date: 2021-04-14 10:04+0000\n" "PO-Revision-Date: 2018-02-01 14:05+0000\n" "Last-Translator: Michael Tremer michael.tremer@ipfire.org\n" "Language-Team: German\n"
Do you have a way to modify the find/grep construction so that it won’t include any files when a “.in” file is available. Maybe .gitignore is useful here, too?
Which target in which Makefile do you believe needs further modifications?
I really feel like I am missing something here.
What we would need is to have the command that generates POTFILES.in a mechanism that reads .gitignore and filters out what we do not want (in this case __init__.py).
Does that sound like it makes sense?
https://git.ipfire.org/?p=location/libloc.git;a=blob;f=Makefile.am;h=e8ee791...
-Michael
--Valters