CVS update by apa-guest ([PATCH] xemacsweb: turn validation on, partial Documentation/Makefile update) . ...
[email protected] Thu, 10 Dec 2009 23:38:11 +0000
| Newsgroups | gmane.emacs.xemacs.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: apa-guest Date: 09/12/10 23:38:11 Modified: . ChangeLog Makefile Log: Subject: [PATCH] xemacsweb: turn validation on, partial Documentation/Makefile update Revision Changes Path 1.291 XEmacs/xemacsweb/ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/ChangeLog,v retrieving revision 1.290 retrieving revision 1.291 diff -u -p -r1.290 -r1.291 --- ChangeLog 10 Dec 2009 00:42:09 -0000 1.290 +++ ChangeLog 10 Dec 2009 23:38:09 -0000 1.291 @@ -1,3 +1,10 @@ +2009-12-11 Adrian Aichner <[email protected]> + + * Makefile: + * Makefile (all): Include validate target. + * Makefile (namazu-re-index): Depend on $(STAMPS)/namazu-re-index. + * Makefile ($(STAMPS)/namazu-re-index): New time-stamp file. + 2009-12-10 Adrian Aichner <[email protected]> * Local.rules.mk (FLAGS): Kill XEmacs properly, load autoloads. 1.63 XEmacs/xemacsweb/Makefile Index: Makefile =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/Makefile,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -r1.62 -r1.63 --- Makefile 10 Dec 2009 00:42:09 -0000 1.62 +++ Makefile 10 Dec 2009 23:38:09 -0000 1.63 @@ -63,7 +63,7 @@ include Local.rules.mk # is working incrementally again. # APA: Must touch $(STAMPS)/htdocs as well since validation updates # dependencies of $(STAMPS)/htdocs -all: htdocs namazu-re-index +all: validate namazu-re-index everything: validate Download/win32 namazu-re-index @@ -71,6 +71,8 @@ validate: htdocs $(ELCS) $(STAMPS)/valid htdocs: $(STAMPS)/htdocs +namazu-re-index: $(STAMPS)/namazu-re-index + # APA: Run linklint on the local working directory tree, including # remote link checking (-net). # Use -output_index site so that all files are reachable in directory @@ -146,8 +148,8 @@ $(STAMPS)/validate: $(VALIDATE_HTML_FILE for i in $?; do \ echo $$i >> VALIDATE_HTML_FILES.txt; \ done - cat VALIDATE_HTML_FILES.txt | xargs $(XEMACS) $(FLAGS) \ - -l ./batch-psgml-validate.elc -f batch-psgml-validate + cat VALIDATE_HTML_FILES.txt | xargs --max-chars=1000 $(XEMACS) \ + $(FLAGS) -l ./batch-psgml-validate.elc -f batch-psgml-validate touch $(STAMPS)/validate # PB: target for rebuilding the namazu index @@ -156,12 +158,12 @@ $(STAMPS)/validate: $(VALIDATE_HTML_FILE # unless they are newer than the associated template. # APA: Must touch $(STAMPS)/... as well since indexing updates # dependencies of $(STAMPS)/... -namazu-re-index: +$(STAMPS)/namazu-re-index: $(VALIDATE_HTML_FILES) touch index.html if test -n "$(NAMAZU_INDEX_DIR)" -a -d "$(NAMAZU_INDEX_DIR)"; then \ $(MKNMZ) --output-dir=$(NAMAZU_INDEX_DIR) . ; \ fi; - touch $(STAMPS)/htdocs + touch $(STAMPS)/namazu-re-index # APA: Remove all .html files (and backups) generated from .content # files. Need to remove timestamp files as well! 1.69 XEmacs/xemacsweb/Documentation/ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/Documentation/ChangeLog,v retrieving revision 1.68 retrieving revision 1.69 diff -u -p -r1.68 -r1.69 --- ChangeLog 2 Oct 2007 18:38:36 -0000 1.68 +++ ChangeLog 10 Dec 2009 23:38:11 -0000 1.69 @@ -1,3 +1,10 @@ +2009-12-11 Adrian Aichner <[email protected]> + + * Makefile (REPOSITORY): New variable. + * Makefile (beta-html): cvs commands need to be replaced with hg + commands. + * Makefile (packages-html): Use REPOSITORY variable. + 2007-10-02 Adrian Aichner <[email protected]> * Makefile: Add rules beta-html and packages-html. 1.4 XEmacs/xemacsweb/Documentation/Makefile Index: Makefile =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/Documentation/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- Makefile 2 Oct 2007 18:38:37 -0000 1.3 +++ Makefile 10 Dec 2009 23:38:11 -0000 1.4 @@ -23,27 +23,32 @@ PACKAGES_TAG = HEAD # covers mule and non-mule packages PACKAGES_DIR = xemacs-packages STAGING = $(shell pwd)/packages +REPOSITORY = :pserver:[email protected]:/cvsroot/xemacs -all: beta-html packages-html +# APA: hg does not seem to be available on www.xemacs.org +# We cannot pull XEmacs sources without out, but we can still update +# package documentation +# all: beta-html packages-html +all: packages-html beta-html: if test ! -d $(SOURCES)/$(BETA_DIR)/man; then \ mkdir $(SOURCES); \ cd $(SOURCES); \ - cvs -f -z3 -d:pserver:[email protected]:/pack/xemacscvs co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/etc/photos; \ - cvs -f -z3 -d:pserver:[email protected]:/pack/xemacscvs co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/man; \ + cvs -f -z3 -d $(REPOSITORY) co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/etc/photos; \ + cvs -f -z3 -d $(REPOSITORY) co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/man; \ cd ..; \ else \ cd $(SOURCES)/$(BETA_DIR)/etc/photos; \ - cvs -f -z3 -d:pserver:[email protected]:/pack/xemacscvs update -r $(BETA_TAG) -Pd; \ + cvs -f -z3 -d $(REPOSITORY) update -r $(BETA_TAG) -Pd; \ cd ../../../..; \ cd $(SOURCES)/$(BETA_DIR)/man; \ - cvs -f -z3 -d:pserver:[email protected]:/pack/xemacscvs update -r $(BETA_TAG) -Pd; \ + cvs -f -z3 -d $(REPOSITORY) update -r $(BETA_TAG) -Pd; \ cd ../../..; \ fi; cd $(SOURCES)/$(BETA_DIR)/man && $(MAKE) TEXI2HTML="$(TEXI2HTML)" HTMLDIR="../../../21.5/html" html -# cvs -f -z3 -d:pserver:[email protected]:/pack/xemacscvs co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \ +# cvs -f -z3 -d $(REPOSITORY) co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \ # time will tell whether master websites need setups different from # Local.rules.template @@ -51,7 +56,7 @@ packages-html: if test ! -d $(SOURCES)/$(PACKAGES_DIR)/packages; then \ mkdir $(SOURCES); \ cd $(SOURCES); \ - cvs -f -z3 -d:pserver:[email protected]:/pack/xemacscvs co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \ + cvs -f -z3 -d $(REPOSITORY) co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \ cp $(PACKAGES_DIR)/packages/Local.rules.template $(PACKAGES_DIR)/packages/Local.rules; \ cd ..; \ else \