[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun GNUmakefile ChangeLog
|
From: |
Kaloian Doganov |
|
Subject: |
trans-coord/gnun/server/gnun GNUmakefile ChangeLog |
|
Date: |
Fri, 14 Mar 2008 21:35:39 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Kaloian Doganov <kaloian> 08/03/14 21:35:39
Modified files:
gnun/server/gnun: GNUmakefile ChangeLog
Log message:
* GNUmakefile:
(replaceable_includes): Renamed to localized-includes. All
referrers changed.
* GNUmakefile: Mass-renaming of names using hyphen instead of
underline. All referrers changed.
(devel_addr): Renamed to devel-addr.
(web_addr): Renamed to web-addr.
(transl_addr): Renamed to transl-addr.
(template_dir): Renamed to template-dir.
(template_files): Renamed to template-files.
(template_translated_base): Renamed to template-translated-base.
(template_lang): Renamed to template-lang.
(template_translated): Renamed to template-translated.
(home_lang): Renamed to home-lang.
(home_translated): Renamed to home-translated.
(articles_pot): Renamed to articles-pot.
(root_articles): Renamed to root-articles.
(root_articles_pot): Renamed to root-articles-pot.
(find_po): Renamed to find-po.
(articles_translated): Renamed to articles-translated.
(generic_rules): Renamed to generic-rules.
(generic_rules) <h_lang>: Renamed to h-lang.
(generic_rules) <po_base>: Renamed to po-base.
(generic_rules) <g_lang>: Renamed to g-lang.
(template_rules): Renamed to template-rules.
(template-rules) <t_lang>: Renamed to t-lang.
(home_rules): Renamed to home-rules.
(home_rules) <h_lang>: Renamed to h-lang.
(article_pot_rules): Renamed to article-pot-rules.
(article_rules): Renamed to article-rules.
(article_rules) <po_base>: Renamed to po-base.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.39&r2=1.40
Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- GNUmakefile 14 Mar 2008 20:41:12 -0000 1.19
+++ GNUmakefile 14 Mar 2008 21:35:39 -0000 1.20
@@ -57,11 +57,11 @@
endif
# Email addresses for notifications.
-devel_addr := address@hidden
+devel-addr := address@hidden
# FIXME: Change to www-discuss in the official instance.
-web_addr := address@hidden
+web-addr := address@hidden
# FIXME: Change to trans-coord-discuss in the official instance.
-transl_addr := address@hidden
+transl-addr := address@hidden
rootdir := ../..
@@ -72,22 +72,22 @@
include gnun.mk
### Special variables for the `www' master templates ###
-template_dir := $(rootdir)/server
-template_files := banner \
+template-dir := $(rootdir)/server
+template-files := banner \
footer-text
-template_translated_base := $(addprefix $(template_dir)/,$(template_files))
-template_lang = $(addsuffix .$(1).html,$(template_translated_base))
-template_translated := $(foreach t_lang,$(TEMPLATE_LINGUAS),$(call
template_lang,$(t_lang)))
+template-translated-base := $(addprefix $(template-dir)/,$(template-files))
+template-lang = $(addsuffix .$(1).html,$(template-translated-base))
+template-translated := $(foreach t-lang,$(TEMPLATE_LINGUAS),$(call
template-lang,$(t-lang)))
ifeq ($(VERBOSE),yes)
-$(info template_translated = $(template_translated))
+$(info template-translated = $(template-translated))
endif
### End of variables declaration (templates) ###
### Special variables for the home pages ###
-home_lang = $(rootdir)/home.$(1).shtml
-home_translated := $(foreach h_lang,$(HOME_LINGUAS),$(call
home_lang,$(h_lang)))
+home-lang = $(rootdir)/home.$(1).shtml
+home-translated := $(foreach h-lang,$(HOME_LINGUAS),$(call
home-lang,$(h-lang)))
ifeq ($(VERBOSE),yes)
-$(info home_translated = $(home_translated))
+$(info home-translated = $(home-translated))
endif
### End of variables declaration (homepages) ###
@@ -95,24 +95,24 @@
# FIXME: Variables' computatation could be optimized, but in any event
# it is much better if translators do not have to add manually anything.
articles := $(foreach dir,$(ALL_DIRS),$(addprefix $(dir)/po/,$(value $(dir))))
-articles_pot := $(addprefix $(rootdir)/,$(articles:%=%.pot))
-root_articles := $(foreach root_article,$(ROOT),$(addprefix
$(rootdir)/po/,$(root_article)))
-root_articles_pot := $(root_articles:%=%.pot)
-ALL_POTS := $(articles_pot) $(root_articles_pot)
+articles-pot := $(addprefix $(rootdir)/,$(articles:%=%.pot))
+root-articles := $(foreach root-article,$(ROOT),$(addprefix
$(rootdir)/po/,$(root-article)))
+root-articles-pot := $(root-articles:%=%.pot)
+ALL_POTS := $(articles-pot) $(root-articles-pot)
ALL_BASE := $(ALL_POTS:%.pot=%)
-find_po = $(wildcard $(1).*.po)
-ALL_POS := $(foreach pot,$(ALL_POTS),$(call find_po,$(basename $(pot))))
+find-po = $(wildcard $(1).*.po)
+ALL_POS := $(foreach pot,$(ALL_POTS),$(call find-po,$(basename $(pot))))
ALL_POS_BASE := $(ALL_POS:%.po=%)
-articles_translated := $(subst /po/,/,$(ALL_POS:%.po=%.html))
+articles-translated := $(subst /po/,/,$(ALL_POS:%.po=%.html))
ifeq ($(VERBOSE),yes)
$(info ALL_POTS = $(ALL_POTS))
-$(info articles_translated = $(articles_translated))
+$(info articles-translated = $(articles-translated))
endif
### End of variables declaration (all articles) ###
.PHONY: all vcs-add-always
-all: $(template_translated) $(home_translated) $(ALL_POTS) \
- $(articles_translated) vcs-add-always
+all: $(template-translated) $(home-translated) $(ALL_POTS) \
+ $(articles-translated) vcs-add-always
# The command to add a file to the repository.
define addfile
@@ -143,14 +143,14 @@
# The command to check the validity of a PO file.
define check-po
-./mailfail $(NOTIFYSKIP) $(transl_addr) \
+./mailfail $(NOTIFYSKIP) $(transl-addr) \
"[GNUN Error] $$$${PO#../../} is not a valid PO file" \
$(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null $$$$PO
endef
# The command to mail errors from make-prototype.
define mail-error-proto
-./mailfail $(NOTIFYSKIP) $(web_addr),$(devel_addr) \
+./mailfail $(NOTIFYSKIP) $(web-addr),$(devel-addr) \
"[GNUN Error] Incompatible change in $(subst $(rootdir),,$<)"
endef
@@ -161,26 +161,26 @@
GENERIC_LINGUAS += $(1)
endef
-define generic_rules
+define generic-rules
generic.$(1).html:
$$(addfile)
endef
-$(foreach h_lang,$(HOME_LINGUAS),$(eval $(call generic-var,$(h_lang))))
-$(foreach po_base,$(ALL_POS_BASE), \
- $(eval $(call generic-var,$(subst .,,$(suffix $(po_base))))))
-$(foreach g_lang,$(sort $(GENERIC_LINGUAS)), \
- $(eval $(call generic_rules,$(g_lang))))
+$(foreach h-lang,$(HOME_LINGUAS),$(eval $(call generic-var,$(h-lang))))
+$(foreach po-base,$(ALL_POS_BASE), \
+ $(eval $(call generic-var,$(subst .,,$(suffix $(po-base))))))
+$(foreach g-lang,$(sort $(GENERIC_LINGUAS)), \
+ $(eval $(call generic-rules,$(g-lang))))
### Specific rules for the templates ###
-.PRECIOUS: $(template_dir)/po/%.pot
-$(template_dir)/po/%.pot: $(template_dir)/%.html
+.PRECIOUS: $(template-dir)/po/%.pot
+$(template-dir)/po/%.pot: $(template-dir)/%.html
$(addfile)
$(generate-pot)
-define template_rules
-.PRECIOUS: $(template_dir)/po/%.$(1).po
-$(template_dir)/po/%.$(1).po: $(template_dir)/po/%.pot
+define template-rules
+.PRECIOUS: $(template-dir)/po/%.$(1).po
+$(template-dir)/po/%.$(1).po: $(template-dir)/po/%.pot
# If the POT is new, it is natural that teams cannot translate it at
# once. Create a copy for every PO file in TEMPLATE_LINGUAS so that
# the build can continue without errors.
@@ -194,14 +194,14 @@
@echo Updating PO file...
$(MSGMERGE) --update $$@ $$< && touch $$@
-$(template_dir)/%.$(1).html: $(template_dir)/%.html
$(template_dir)/po/%.$(1).po
+$(template-dir)/%.$(1).html: $(template-dir)/%.html
$(template-dir)/po/%.$(1).po
$$(addfile)
- PO=$(template_dir)/po/$$(*F).$(1).po ; $(check-po)
- PO=$(template_dir)/po/$$(*F).$(1).po OUT=$$@ ; $(generate-html)
+ PO=$(template-dir)/po/$$(*F).$(1).po ; $(check-po)
+ PO=$(template-dir)/po/$$(*F).$(1).po OUT=$$@ ; $(generate-html)
$(SED) --in-place ':egin;N;$$$$!begin;s/\([ \t]*\n[
\t]*\)\{3,\}<!--/\n\n<!--/g' $$@
endef
-$(foreach t_lang,$(TEMPLATE_LINGUAS),$(eval $(call template_rules,$(t_lang))))
+$(foreach t-lang,$(TEMPLATE_LINGUAS),$(eval $(call template-rules,$(t-lang))))
### End of the templates-specific rules ###
### Specific rules for the homepages ###
@@ -210,7 +210,7 @@
# order to prevent further messing up in the chain. For extra safety,
# exit with an error so that make does not proceed to the next
# command.
- $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(web_addr) $<
+ $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(web-addr) $<
$(mail-error-proto) ./make-prototype --home --input=$< \
--generic=generic.html --output=$@ || ($(RM) $@ ; exit 1)
$(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
@@ -222,7 +222,7 @@
$(addfile)
$(generate-pot)
-define home_rules
+define home-rules
$(rootdir)/po/home.$(1).po: $(rootdir)/po/home.pot
PO=$$@ ; $(check-po)
$(MSGMERGE) --update $$@ $$<
@@ -253,18 +253,18 @@
# FIXME: Remove this conditional when GNUN operates in `www', where we
# want to validate everything.
ifneq (,$(findstring $(1),bg ru))
- $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl_addr) \
+ $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl-addr) \
$$@ || (sleep 1 ; touch $(rootdir)/po/home.$(1).po ; exit 1)
endif
endef
-$(foreach h_lang,$(HOME_LINGUAS),$(eval $(call home_rules,$(h_lang))))
+$(foreach h-lang,$(HOME_LINGUAS),$(eval $(call home-rules,$(h-lang))))
### End of the homepages-specific rules ###
### Rules for all other articles ###
-define article_pot_rules
+define article-pot-rules
$(1).proto $(1).translinks: $(subst /po/,/,$(1).html)
- $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl_addr) $$<
+ $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl-addr) $$<
$$(mail-error-proto) ./make-prototype --input=$$< \
--generic=generic.html --output=$(1).proto \
--translinks=$(1).translinks \
@@ -279,7 +279,7 @@
$$(generate-pot)
endef
-define article_rules
+define article-rules
$(1).po: $(basename $(1)).pot
PO=$$@ ; $(check-po)
$(MSGMERGE) --update $$@ $$<
@@ -297,13 +297,13 @@
$(SED) --in-place "s/\(<!--#include
virtual=\".*$$$$inc\)\(.html\" -->\)/\1.$(2)\2/g" $(1).m4; \
done;
$(M4) $(1).m4 > $$@
- $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl_addr) \
+ $(VALIDATESKIP) ./validate-html-notify $(NOTIFYSKIP) $(transl-addr) \
$$@ || (sleep 1 ; touch $(1).po ; exit 1)
endef
-$(foreach base,$(ALL_BASE),$(eval $(call article_pot_rules,$(base))))
+$(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))
# FIXME: This is close to hell. There should be an easier way to do it.
-$(foreach po_base,$(ALL_POS_BASE),$(eval $(call
article_rules,$(po_base),$(subst .,,$(suffix $(po_base))))))
+$(foreach po-base,$(ALL_POS_BASE),$(eval $(call
article-rules,$(po-base),$(subst .,,$(suffix $(po-base))))))
### End of all articles' rules ###
# If VCS=always, add all necessary files. The templates' POT are not
@@ -312,8 +312,8 @@
# WARNING: This is horribly slow and is implemented just in case.
ifneq (,$(findstring always,$(VCS)))
vcs-add-always:
- for file in $(template_translated) $(home_translated) $(ALL_POTS) \
- $(articles_translated) $(wildcard generic.*.html); do \
+ for file in $(template-translated) $(home-translated) $(ALL_POTS) \
+ $(articles-translated) $(wildcard generic.*.html); do \
($(CVS) add $$file ; exit 0) ; done
else
vcs-add-always: ;
@@ -326,7 +326,7 @@
# make sure to `cvs add'/`cvs remove' and commit the article when
# editing gnun.mk.
wwwdir := $(rootdir)/$(rootdir)/www
-orig-templates := $(addsuffix .html,$(template_translated_base))
+orig-templates := $(addsuffix .html,$(template-translated-base))
orig-articles := $(addsuffix .html,$(subst /po/,/,$(ALL_BASE)))
files-to-sync := $(rootdir)/home.shtml $(orig-templates) $(orig-articles)
abs-files-to-sync := $(subst $(rootdir)/,,$(files-to-sync))
@@ -345,7 +345,7 @@
for file in $(abs-files-to-sync) ; do \
if [ ! -f $(wwwdir)/$$file ] ; then \
echo "Warning: $$file missing in www; update the variable?" \
- | $(CVSSKIP) mail -s "sync: missing file" $(devel_addr) ; \
+ | $(CVSSKIP) mail -s "sync: missing file" $(devel-addr) ; \
else \
cp -p --update $(wwwdir)/$$file $(rootdir)/$$file ; \
fi ; done
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- ChangeLog 14 Mar 2008 20:41:13 -0000 1.39
+++ ChangeLog 14 Mar 2008 21:35:39 -0000 1.40
@@ -1,7 +1,37 @@
2008-03-14 Kaloian Doganov <address@hidden>
- * GNUmakefile (replaceable_includes): Renamed to
- localized-includes. All referrers changed.
+ * GNUmakefile:
+ (replaceable_includes): Renamed to localized-includes. All
+ referrers changed.
+
+ * GNUmakefile: Mass-renaming of names using hyphen instead of
+ underline. All referrers changed.
+ (devel_addr): Renamed to devel-addr.
+ (web_addr): Renamed to web-addr.
+ (transl_addr): Renamed to transl-addr.
+ (template_dir): Renamed to template-dir.
+ (template_files): Renamed to template-files.
+ (template_translated_base): Renamed to template-translated-base.
+ (template_lang): Renamed to template-lang.
+ (template_translated): Renamed to template-translated.
+ (home_lang): Renamed to home-lang.
+ (home_translated): Renamed to home-translated.
+ (articles_pot): Renamed to articles-pot.
+ (root_articles): Renamed to root-articles.
+ (root_articles_pot): Renamed to root-articles-pot.
+ (find_po): Renamed to find-po.
+ (articles_translated): Renamed to articles-translated.
+ (generic_rules): Renamed to generic-rules.
+ (generic_rules) <h_lang>: Renamed to h-lang.
+ (generic_rules) <po_base>: Renamed to po-base.
+ (generic_rules) <g_lang>: Renamed to g-lang.
+ (template_rules): Renamed to template-rules.
+ (template-rules) <t_lang>: Renamed to t-lang.
+ (home_rules): Renamed to home-rules.
+ (home_rules) <h_lang>: Renamed to h-lang.
+ (article_pot_rules): Renamed to article-pot-rules.
+ (article_rules): Renamed to article-rules.
+ (article_rules) <po_base>: Renamed to po-base.
2008-03-14 Yavor Doganov <address@hidden>