From: Reini U. <ru...@x-...> - 2002-01-13 15:47:27
|
I had unsolvable problems on cygwin's make with locale/Makefile, re-generating the po's from the sources. the problem is probably $(wildcard ../<stuff>/*). With $(wildcard locale/<stuff>/*) it works fine. So I converted the makefile to be called from the basedir. This works fine now. I'm just finishing the WantedPages plugin. Any objections to use ~$ make -f locale/Makefile instead of ~/locale/$ make If not I'll commit. I'll doing more changes on the de.po and german pages, and I want to generate the mo's by myself, not to conflict with carsten again. -- Reini Urban http://atelier.akbild.ac.at/ (soon) http://xarch.tu-graz.ac.at/home/rurban/ (big) http://tv.mur.at/ (kulturelles) |
From: Jeff D. <da...@da...> - 2002-01-13 18:16:34
|
On Sun, 13 Jan 2002 15:47:21 +0000 "Reini Urban" <ru...@x-...> wrote: > Any objections to use > ~$ make -f locale/Makefile If make has to be run in the top level directory, I'd prefer the Makefile also be in the top level directory. (Perhaps named "locale.mk".) Better still, let's see if we can find a way to work around the $(wildcard) problems. See if this works for you: PHP_SRC := $(shell find .. -name "*.html" -o -name "*.php") It might be good to eliminate the GNU-Make-isms in the makefile. That means doing away with $(shell), $(wildcard) and $(patsubst). We would probably have to introduce another ancillary shell script to be able to do without those. ====== And while we're on the subject: I propose we remove all the dynamically generated files from the CVS. (They should still be generated and included in all tar-balls, including nightly snapshot tarballs.) There's no point in having these under version control, and I'm getting sick of seeing all the "remake in locale" messages on phpwiki-checkins. The files I propose removing from CVS ar: locale/*/LC_MESSAGES/* locale/po/phpwiki.pot The only draw-back to this plan is that anyone who gets their PhpWiki direct from CVS will need to have the gettext utils installed in order to use i18n. Steve, where is the nightly tar-ball script run? Would the tar-ball script have any trouble in locale/Makefile? |
From: Carsten K. <car...@ma...> - 2002-01-13 19:33:37
|
Another option would be that email notification could be suppressed for directories named LC_MESSAGES. This is determined by the CVSROOT/loginfo file. Currently it contains: CVSROOT $CVSROOT/CVSROOT/syncmail %{sVv} sw...@wc... DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} phpwiki- che...@li... # The "loginfo" file controls where "cvs commit" log information # is sent. The first entry on a line is a regular expression which must match # the directory that the change is being made to, relative to the # $CVSROOT. If a match is found, then the remainder of the line is a filter # program that should expect log information on its standard input. # # If the repository name does not match any of the regular expressions in this # file, the "DEFAULT" line is used, if it is specified. We just need to come up with a line containing a regexp for LC_MESSAGES to insert between the first two lines shown above, maybe redirect to /dev/null. Carsten On Sunday, January 13, 2002, at 01:16 pm, Jeff Dairiki wrote: > On Sun, 13 Jan 2002 15:47:21 +0000 > "Reini Urban" <ru...@x-...> wrote: > I propose we remove all the dynamically generated files from the CVS. > (They should still be generated and included in all tar-balls, including > nightly snapshot tarballs.) There's no point in having these under > version control, and I'm getting sick of seeing all the "remake in locale" > messages on phpwiki-checkins. > > The files I propose removing from CVS ar: > locale/*/LC_MESSAGES/* > locale/po/phpwiki.pot > > The only draw-back to this plan is that anyone who gets their PhpWiki > direct from CVS will need to have the gettext utils installed in order to > use i18n. > > Steve, where is the nightly tar-ball script run? Would the tar-ball > script have any trouble in locale/Makefile? |
From: Jeff D. <da...@da...> - 2002-01-13 20:06:37
|
On Sun, 13 Jan 2002 10:16:30 -0800 Jeff Dairiki <da...@da...> wrote: On further thought, it might be best to hardcode the list of files which need to be xgettext()ed into the Makefile. Certainly, it's the most portable plan. I'll work on it now. |
From: Carsten K. <car...@ma...> - 2002-01-13 18:52:57
|
I have no more German or locale stuff to commit so it's all yours. :-) Carsten On Sunday, January 13, 2002, at 10:47 am, Reini Urban wrote: > > If not I'll commit. I'll doing more changes on the de.po and german pages, > and I want to generate the mo's by myself, not to conflict with carsten > again. |