Am Samstag, 23. April 2016 um 12:01:32, schrieb Kornel Benko <kor...@lyx.org> > Am Samstag, 23. April 2016 um 11:42:25, schrieb Kornel Benko <kor...@lyx.org> > > Am Samstag, 23. April 2016 um 11:13:46, schrieb Georg Baum > > <georg.b...@post.rwth-aachen.de> > > > Jean-Marc Lasgouttes wrote: > > > > > > > Le 22/04/2016 07:14, Georg Baum a écrit : > > > >> After the remerge with cmake, I get > > > >> this in the diff of de.po (the last remerge of it was on windows): > > > >> > > > >> -#: src/frontends/qt4/ui/BibitemUi.ui:54 > > > >> src/frontends/qt4/ui/RefUi.ui:190 +#: > > > >> src/frontends/qt4/ui/BibitemUi.ui:54 src/frontends/qt4/ui/LabelUi.ui:36 > > > >> +#: src/frontends/qt4/ui/RefUi.ui:190 > > > > > > > > I get the same after a remerge using autoconf. I do not think that the > > > > issue is the build system. > > > > > > Yes, this particular change does not depend on the build system, but does > > > that mean you don't get a different sorting of the complete entries like > > > in > > > 79074e6c87? > > > > > > To my knowledge, there are two issues: > > > > > > 1) the one described above, caused by gettext (used on windows) vs. > > > msguniq > > > (used on unix) > > > > > > 2) the different order of all entries that can be seen e.g. in > > > 79074e6c87, > > > caused by cmake vs autotools. > > > > > > Currently, there is no way to avoid 1), but we hagve to make up our minds > > > whether we want to play ping pong with 2) or not. > > > > > > > > > > For 2), in cmake we try to sort po-source-files (listed in POTFILES.in) > > first. If that could be done in automake too, > > the output should be identical. > > > > Hm, there are more differences. In cmake we add also header files to the list. > But I wonder, why unix command 'sort' is not working the same as cmake > internal sort.
OK, setting env LC_ALL=C, sort behaves under linux as the internal sort in
cmake.
Kornel
signature.asc
Description: This is a digitally signed message part.
