[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: cb4e6c18118fa2421e17eb684d16c82da4c911ff

[code]

revision:            cb4e6c18118fa2421e17eb684d16c82da4c911ff
date:                2010-12-30T01:08:54
author:              address@hidden
branch:              net.venge.monotone.source-tree-cleanup
changelog:
* Makefile.am: keep gettext artifacts under po/ in the builddir
* po/README: adapt the make rules accordingly; remove the section
  which explains largely how monotone.iss must be updated for
  new translations: this is no longer needed since we have a
  separate make target for this
* .mtn-ignore: adapted accordingly

manifest:
format_version "1"

new_manifest [743e6ad72f7d71f3ba2d07643c15a3ac4349cdc6]

old_revision [af54b830277ced10ba7492afcb3f8f852fcec0d4]

patch ".mtn-ignore"
 from [f5f091af105525f13f4263a6ac869ef6c20d41af]
   to [d4e7d97ed47e8739db7f7292b8e176615623a204]

patch "Makefile.am"
 from [c2866c10d6a55dbdddc16934e0010f52053ec379]
   to [c725bba98ed339861f130e5fab0f9a080b0336d5]

patch "po/README"
 from [0719457c42fb35cb33b1c788ce85ec7361d79049]
   to [d6d154ff99e3cfff840705b6fabd7c89f87408b6]
============================================================
--- Makefile.am	c2866c10d6a55dbdddc16934e0010f52053ec379
+++ Makefile.am	c725bba98ed339861f130e5fab0f9a080b0336d5
@@ -405,15 +405,16 @@ ALL_LINGUAS := $(basename $(notdir $(ALL
 include $(srcdir)/po/Makevars
 ALL_POFILES := $(wildcard $(srcdir)/po/*.po)
 ALL_LINGUAS := $(basename $(notdir $(ALL_POFILES)))
-ALL_GMOFILES := $(addsuffix .gmo, $(ALL_LINGUAS))
-CLEAN_POFILES := $(ALL_GMOFILES) $(addsuffix .merged.po, $(ALL_LINGUAS)) \
-		 $(PACKAGE).pot
+ALL_GMOFILES := $(addprefix po/,$(addsuffix .gmo, $(ALL_LINGUAS)))
+CLEAN_POFILES := $(ALL_GMOFILES) \
+		 $(addprefix po/,$(addsuffix .merged.po, $(ALL_LINGUAS))) \
+		 po/$(PACKAGE).pot
 
 EXTRA_DIST += $(ALL_POFILES) po/LINGUAS po/README
 
 if USE_NLS
 # for installation
-GMOFILES := $(addsuffix .gmo, $(INST_LINGUAS))
+GMOFILES := $(addprefix po/,$(addsuffix .gmo, $(INST_LINGUAS)))
 
 all-local: $(GMOFILES)
 
@@ -421,7 +422,7 @@ install-data-local: all-local
 	@linguas='$(INST_LINGUAS)'; set -ex; for lang in $$linguas; do \
 	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(MKDIR_P) $$dir; \
-	  $(INSTALL_DATA) $$lang.gmo $$dir/$(PACKAGE).mo; \
+	  $(INSTALL_DATA) po/$$lang.gmo $$dir/$(PACKAGE).mo; \
 	done
 
 uninstall-local:
@@ -433,16 +434,16 @@ if REBUILD_NLS
 endif
 
 if REBUILD_NLS
-%.gmo: %.merged.po
+po/%.gmo: po/%.merged.po
 	$(V_msgfmt)$(MSGFMT) -c --statistics -o $@ $<
 
-%.merged.po: $(srcdir)/po/%.po $(PACKAGE).pot
+po/%.merged.po: $(srcdir)/po/%.po po/$(PACKAGE).pot
 	$(V_msgmerge)$(MSGMERGE) $^ -q -o $@
 
 # for translators' use
-UPDATEPOFILES = $(addsuffix .po-update, $(ALL_LINGUAS))
+UPDATEPOFILES = $(addprefix po/,$(addsuffix .po-update, $(ALL_LINGUAS)))
 
-%.po-update: $(srcdir)/po/%.po $(PACKAGE).pot
+po/%.po-update: $(srcdir)/po/%.po po/$(PACKAGE).pot
 	$(MSGMERGE) --update $^
 
 update-po: $(UPDATEPOFILES)
@@ -452,7 +453,7 @@ POTFILES = $(filter-out package_%, $(MOS
 	$(UNIX_PLATFORM_SOURCES) $(WIN32_PLATFORM_SOURCES) \
 	src/monotone.cc src/std_hooks.lua
 
-$(PACKAGE).pot: $(POTFILES)
+po/$(PACKAGE).pot: $(POTFILES)
 	$(V_xgettext)$(XGETTEXT) -o$@ -D. -D$(top_srcdir) -cTRANSLATORS: \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' \
@@ -469,7 +470,7 @@ else
 
 else
 
-%.gmo: $(srcdir)/po/%.gmo
+po/%.gmo: $(srcdir)/po/%.gmo
 	cp $< $@
 
 dist-hook:
============================================================
--- .mtn-ignore	f5f091af105525f13f4263a6ac869ef6c20d41af
+++ .mtn-ignore	d4e7d97ed47e8739db7f7292b8e176615623a204
@@ -32,7 +32,6 @@
 ^mkinstalldirs$
 ^monotone\.(cps?|fn|ky|pg|tp|vr|toc|pdf|ps|dvi|log|info(-[0-9]+)?)$
 ^monotone\.html$
-^monotone\.pot$
 ^mtn$
 ^mtn.1$
 ^mtn.dSYM$
@@ -40,10 +39,13 @@
 ^po/Makefile(\.in)*$
 ^po/POTFILES$
 ^po/Rules-quot$
+^po/[^.]+.gmo$
+^po/[^.]+.merged.po$
 ^po/boldquot\.sed$
 ^po/address@hidden
 ^po/address@hidden
 ^po/insert-header\.sin$
+^po/monotone\.pot$
 ^po/quot\.sed$
 ^run_(func|tester|unit)_tests$
 ^src/package_(full_)?revision(\.cc|\.txt|_(dist|raw)\.txt)$
============================================================
--- po/README	0719457c42fb35cb33b1c788ce85ec7361d79049
+++ po/README	d6d154ff99e3cfff840705b6fabd7c89f87408b6
@@ -34,28 +34,18 @@ 1) Add an line for your language to the 
    Portugal Portuguese (pt_PT).  (Note: the pt_BR translation has not
    been updated for some time, so it is not included in po/LINGUAS.)
 
-2) Add a line for the compiled translation file to win32/monotone.iss
-   so that it is included in future Win32 installer packages.  The
-   line needs to look like this:
-
-Source: "..\po\CODE.gmo"; DestDir: "{app}\locale\CODE\LC_MESSAGES"; DestName: "monotone.mo"; Flags: ignoreversion
-
-   Everything on this line should be copied into monotone.iss exactly
-   as it appears except the word CODE, which you should replace with
-   the code you added to po/LINGUAS.
-
-3) Create a template file:
+2) Create a template file:
   
    $ cd <your source directory>
    $ autoreconf --install
    $ ./configure
-   $ make monotone.pot
+   $ make po/monotone.pot
 
-   This will create the file monotone.pot, which lists every message
+   This will create the file po/monotone.pot, which lists every message
    that you need to translate.  Copy this file to po/CODE.po (again,
    replace CODE with the code you added to po/LINGUAS).
    
-4) Fill out the header of your new .po file.  This mailing list post
+3) Fill out the header of your new .po file.  This mailing list post
    gives excellent advice on how to do so:
 
      http://mail.gnome.org/archives/gnome-i18n/2004-July/msg00073.html
@@ -87,9 +77,9 @@ 4) Fill out the header of your new .po f
       doesn't list a plural form in the template file, please tell us
       about it on monotone-dev.)
 
-5) Start translating the entries.  When finished, commit the new .po
+4) Start translating the entries.  When finished, commit the new .po
    file and push your changes to monotone.ca.  Don't forget to commit
-   po/LINGUAS and win32/monotone.iss as well.
+   po/LINGUAS as well.
 
    If you're looking for a nice GUI to edit language files, we
    recommend KBabel, which comes with the kdesdk module of KDE, or
@@ -98,17 +88,17 @@ 5) Start translating the entries.  When 
      http://kbabel.kde.org/
      http://www.poedit.net/
 
-6) To update your template when the sources change, you can use this
+5) To update your template when the sources change, you can use this
    command:
 
-   $ make CODE.po-update
+   $ make po/CODE.po-update
 
    This will update monotone.pot from the sources and then use the
    "msgmerge" utility to update your translation.  It updates
    po/CODE.po in place.  If you prefer for this not to happen, you can
    instead do
 
-   $ make CODE.merged.po
+   $ make po/CODE.merged.po
 
    which will drop the new .po file, with a ".merged.po" extension, in
    the directory where you ran "make".  You can then edit that file
@@ -116,4 +106,5 @@ 6) To update your template when the sour
 
    To check if new or fuzzy strings have arrived, use msgfmt:
 
-   $ msgfmt -cv po/CODE.po  # or CODE.merged.po
+   $ msgfmt -cv po/CODE.po  # or po/CODE.merged.po
+