[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun GNUmakefile.team C...
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun GNUmakefile.team C... |
Date: |
Tue, 08 Jan 2013 07:39:54 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 13/01/08 07:39:53
Modified files:
gnun/server/gnun: GNUmakefile.team ChangeLog
Log message:
(sync-master): New variable.
(sync-file) <sync-$(1)>: Depend on $(sync-master).
Merge files on update of master compendium. Discussed
with Denis Barbier on bug-gnun.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.342&r2=1.343
Patches:
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- GNUmakefile.team 6 Jan 2013 16:50:24 -0000 1.27
+++ GNUmakefile.team 8 Jan 2013 07:39:51 -0000 1.28
@@ -215,6 +215,25 @@
endif
endif
+sync-master :=
+# Sync master compendium when present.
+ifneq (,$(master))
+team-master := $(wildcard server/gnun/compendia/master.$(TEAM).po)
+ifneq (,$(team-master))
+.PHONY: sync-master
+sync-master:
+ @if $(call cmp-POs,$(master),$(team-master)); then \
+ echo "$(team-master): Already in sync."; \
+ else \
+ echo "$(team-master): Copying from \`www'."; \
+ cp $(master) $(team-master); \
+ fi
+ @$(call echo-statistics,$(team-master))
+sync: sync-master
+sync-master := sync-master
+endif
+endif
+
# The command to compare PO files; comments and dates are generally
# considered insignificant. The msgfmt output is compared
# in order to take into account the case when they only differ
@@ -254,7 +273,7 @@
define sync-file
.PNONY: sync-$(1)
-sync-$(1):
+sync-$(1): $(sync-master)
@file=$(1); \
pot=$(wwwdir)`dirname $1`/po/`basename $$$${file%.$(TEAM).po}.pot`; \
test -f $$$$pot || pot=$$$$pot.opt; \
@@ -263,6 +282,7 @@
else \
www_po=$(wwwdir)`dirname $1`/po/`basename $1`; \
if test -f $$$${www_po}; then \
+ $$(if $(master), test $$$$file -nt $(master) && ) \
$$(call cmp-POs,$1,$$$${www_po}) \
&& echo "$$$${file#./}: Already in sync." \
|| { \
@@ -290,23 +310,6 @@
$(foreach file, $(patsubst ./%, %, $(translations)), \
$(eval $(call sync-file,$(file))))
-# Sync master compendium when present.
-ifneq (,$(master))
-team-master := $(wildcard server/gnun/compendia/master.$(TEAM).po)
-ifneq (,$(team-master))
-.PHONY: sync-master
-sync-master:
- @if $(call cmp-POs,$(master),$(team-master)); then \
- echo "$(team-master): Already in sync."; \
- else \
- echo "$(team-master): Copying from \`www'."; \
- cp $(master) $(team-master); \
- fi
- @$(call echo-statistics,$(team-master))
-sync: sync-master
-endif
-endif
-
# Import translated file lists from www.
-include $(www_gnun_dir)gnun.mk
# Assign priorities to translations for report.
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -b -r1.342 -r1.343
--- ChangeLog 6 Jan 2013 16:50:24 -0000 1.342
+++ ChangeLog 8 Jan 2013 07:39:52 -0000 1.343
@@ -1,3 +1,10 @@
+2013-01-08 Pavel Kharitonov <address@hidden>
+
+ * GNUmakefile.team (sync-master): New variable.
+ (sync-file) <sync-$(1)>: Depend on $(sync-master).
+ Merge files on update of master compendium. Discussed
+ with Denis Barbier on bug-gnun.
+
2013-01-06 Pavel Kharitonov <address@hidden>
* GNUmakefile.team: Sync master.$(TEAM).po; make translations