[www-el-commits] www-el GNUmakefile

[Georgios Zarkadas]

CVSROOT:        /cvsroot/www-el
Module name:    www-el
Changes by:     Georgios Zarkadas <gzarkadas>   11/03/26 09:55:20

Modified files:
        .              : GNUmakefile 

Log message:
        small reorganisation; part 1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/www-el/GNUmakefile?cvsroot=www-el&r1=1.22&r2=1.23

Patches:
Index: GNUmakefile
===================================================================
RCS file: /cvsroot/www-el/www-el/GNUmakefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- GNUmakefile 22 Mar 2011 19:25:20 -0000      1.22
+++ GNUmakefile 26 Mar 2011 09:55:20 -0000      1.23
@@ -42,8 +42,9 @@
 #
 wwwdir := ../www/
 
+## Binaries
+
 # Adjust these variables if you don't have the programs in your PATH.
-#
 MSGMERGE := msgmerge
 MSGFMT := msgfmt
 MSGCAT := msgcat
@@ -62,46 +63,29 @@
 # Note that trash does not currently accept any options.
 RM := rm --force
 
-# Script to be created by publish target (commits all published .po files).
-#
-commitfile := $(wwwdir)commit-pub
-
-# FIXME: this is too hack-ish; please improve
-# Mappings: . -> $ | _ -> ' | {\`} -> ` | {^ } -> \n
-
-define commit_header
-#!/bin/sh^\
-# Auto-generated by team GNUmakefile^\
-# Commits currently published team po files^\
-^\
-cvs commit -m ".@" \`cat <<< _
-endef
-
-define commit_footer
-_ | tr _\n_ _ _\`
-endef
-
-# Path to obsolete translations storage catalog.
-#
-obcatalog := __tools__/deleted.el.po
+## Paths and Files
 
 # Paths to exclude from search (for example tools or test sub-directories).
 # Space separated list of {-not -path <path wildcard>} items.
 #
 excluded := -not -path './__tools__/*' -not -path './incoming/*'
 
-# Expression to retrieve all translations
-#
+# Retrieve all translations
 translations := $(shell find -name '*.$(TEAM).po' $(excluded) | sort)
 
-# Warning message for the `publish' rule.
-#
-pubwmsg := "Warning (%s): %s\n  does not exist; (either obsolete or \`cvs\
-update\' in $(wwwdir) needed).\n"
+# Retrieve all translations templates
+templates := $(join $(join $(join $(wwwdir),$(dir 
$(translations))),po/),$(patsubst %.$(TEAM).po,%.pot,$(notdir $(translations))))
 
-log := "Automatic merge from the master repository."
+# Obsolete translations storage catalog.
+obcatalog := __tools__/deleted.el.po
 
-noupdmsg := 'Repositories were not updated, you might want "make VCS=yes".'
+## VCS-related staff
+
+# We record UTC time with second accuracy to allow correct operation of tags 
+# even when multiple syncs per day are performed from multiple users.
+
+lastrun := $(shell date --rfc-3339=seconds | tr ' +' '__' | tr -d ':')
+runtag := $(join status_,$(lastrun))
 
 # Determine the VCS and relevant update/commit commands.
 
@@ -116,10 +100,8 @@
 ifdef VERBOSE
 $(info Repository: $(repo))
 $(info translations = $(translations))
-
-msgmergeverbose := --verbose
+mmverbose := --verbose
 echofile := echo $$file: ;
-
 cvsquiet :=
 # Also applicable for Hg and Git.
 bzrquiet := --verbose
@@ -128,13 +110,6 @@
 bzrquiet := --quiet
 endif
 
-# We record UTC time with second accuracy to allow correct operation of tags 
-# even when multiple syncs per day are performed from multiple users.
-
-lastrun := $(shell date --rfc-3339=seconds | tr ' +' '__' | tr -d ':')
-
-runtag := $(join status_,$(lastrun))
-
 # The commands to update/commit/tag the CVS repository.
 
 define cvs-update
@@ -232,14 +207,46 @@
 endef
 
 # To find prefix, make repo lowercase and substitute arch by tla
-#
 repoprefix := $(subst arch,tla,$(shell echo $(repo) | tr A-Z a-z))
 
+# Dynamic repository commands 
 repoupdate := $($(repoprefix)-update)
 repocommit := $($(repoprefix)-commit)
 repotag := $($(repoprefix)-tag)
 
-# Targets
+## Messages
+
+# Warning message for the `publish' rule.
+pubwmsg := "Warning (%s): %s\n  does not exist; (either obsolete or \`cvs\
+update\' in $(wwwdir) needed).\n"
+
+# Vcs auto-commit log message
+log := "Automatic merge from the master repository."
+
+# no-commit info message
+noupdmsg := 'Repositories were not updated, you might want "make VCS=yes".'
+
+## Target-specific additions
+
+# Script to be created by publish target (commits all published .po files).
+commitfile := $(wwwdir)commit-pub
+
+# FIXME: this is too hack-ish; please improve
+# Mappings: . -> $ | _ -> ' | {\`} -> ` | {^ } -> \n
+
+define commit_header
+#!/bin/sh^\
+# Auto-generated by team GNUmakefile^\
+# Commits currently published team po files^\
+^\
+cvs commit -m ".@" \`cat <<< _
+endef
+
+define commit_footer
+_ | tr _\n_ _ _\`
+endef
+
+## Targets
 
 # Putting fuzdiff, obremove *after* the sync, gives us the option to use 
 # their features locally, without storing our specialised po formats in
@@ -251,7 +258,6 @@
 all: update sync report obreport fuzdiff obremove
 
 # Update the master and the team repositories.
-# Do not record www/ update in logfile to save considerable space.
 .PHONY: update
 update:
 ifeq ($(VCS),yes)
@@ -272,7 +278,7 @@
            $${file/.$(TEAM).po/.pot}` ]; then \
            echo "Warning: $(notdir $$file) has no equivalent .pot in www."; \
          else \
-           $(echofile) $(MSGMERGE) $(msgmergeverbose) --quiet --update \
+           $(echofile) $(MSGMERGE) $(mmverbose) --quiet --update \
            --previous $$file \
            $(wwwdir)`dirname $$file`/po/`basename $${file/.$(TEAM).po/.pot}`; \
          fi; \