CVS update by apa-guest . ...
[email protected] Thu, 10 Dec 2009 00:42:09 +0000
| Newsgroups | gmane.emacs.xemacs.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: apa-guest Date: 09/12/10 00:42:09 Modified: . ChangeLog Local.rules.mk Makefile Log: xemacsweb: Make website validation incremetal again, don't turn it on yet, minor changes for testing -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2009-12-10 Adrian Aichner <[email protected]> * Local.rules.mk (FLAGS): Kill XEmacs properly, load autoloads. * Makefile: * Makefile (VALIDATE_HTML_FILES): Can be determined up fron by means of GENERATED_HTML_FILES. * Makefile (validate): Make website validation incremetal again, don't turn it on yet. * Makefile (htdocs): * Makefile (init): Create $(STAMPS) directory. * Makefile ($(STAMPS)/htdocs): Depend on CONTENT_FILES directly. About/ChangeLog addition: 2009-12-10 Adrian Aichner <[email protected]> * XEmacsServices.content: Minor changes for testing. Revision Changes Path 1.230 XEmacs/xemacsweb/About/ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/About/ChangeLog,v retrieving revision 1.229 retrieving revision 1.230 diff -u -p -r1.229 -r1.230 --- ChangeLog 5 Dec 2009 13:41:19 -0000 1.229 +++ ChangeLog 10 Dec 2009 00:42:07 -0000 1.230 @@ -1,3 +1,7 @@ +2009-12-10 Adrian Aichner <[email protected]> + + * XEmacsServices.content: Minor changes for testing. + 2009-12-05 Adrian Aichner <[email protected]> * Website.content: Update website commit example. issue 278 has 1.78 XEmacs/xemacsweb/About/XEmacsServices.content Index: XEmacsServices.content =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/About/XEmacsServices.content,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 --- XEmacsServices.content 29 Nov 2009 14:54:28 -0000 1.77 +++ XEmacsServices.content 10 Dec 2009 00:42:07 -0000 1.78 @@ -178,7 +178,8 @@ Adrian Aichner **** Access allowed: Personal Karma exceeds Environmental Karma. RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vm/lisp/vm-revno.el,v done -cvs server: ERROR: cannot write file /pack/xemacscvs/XEmacs/packages/xemacs-packages/vm/lisp/vm-revno.el,v: No space left on device +cvs server: ERROR: cannot write file \ +/pack/xemacscvs/XEmacs/packages/xemacs-packages/vm/lisp/vm-revno.el,v: No space left on device cvs [server aborted]: ERROR: out of space - aborting </pre> <p>Also verified with `df' from shell, there's no space there.</p> 1.290 XEmacs/xemacsweb/ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/ChangeLog,v retrieving revision 1.289 retrieving revision 1.290 diff -u -p -r1.289 -r1.290 --- ChangeLog 6 Dec 2009 13:54:33 -0000 1.289 +++ ChangeLog 10 Dec 2009 00:42:09 -0000 1.290 @@ -1,3 +1,15 @@ +2009-12-10 Adrian Aichner <[email protected]> + + * Local.rules.mk (FLAGS): Kill XEmacs properly, load autoloads. + * Makefile: + * Makefile (VALIDATE_HTML_FILES): Can be determined up fron by + means of GENERATED_HTML_FILES. + * Makefile (validate): Make website validation incremetal again, + don't turn it on yet. + * Makefile (htdocs): + * Makefile (init): Create $(STAMPS) directory. + * Makefile ($(STAMPS)/htdocs): Depend on CONTENT_FILES directly. + 2009-12-06 Adrian Aichner <[email protected]> * batch-psgml-validate.el (batch-psgml-validate): Don't indent 1.3 XEmacs/xemacsweb/Local.rules.mk Index: Local.rules.mk =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/Local.rules.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- Local.rules.mk 27 Feb 2008 05:55:52 -0000 1.2 +++ Local.rules.mk 10 Dec 2009 00:42:09 -0000 1.3 @@ -25,7 +25,7 @@ endif # reasonable defaults for windows. XEMACS=xemacs -FLAGS=-batch -vanilla +FLAGS=-eval '(kill-emacs 0)' -batch -q -no-site-file FIND=find MKDIR=mkdir 1.62 XEmacs/xemacsweb/Makefile Index: Makefile =================================================================== RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/Makefile,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- Makefile 6 Dec 2009 13:54:37 -0000 1.61 +++ Makefile 10 Dec 2009 00:42:09 -0000 1.62 @@ -42,7 +42,7 @@ PRUNES := \( $(PRUNES) -o $(PRUNE_215_TE # These must be recursively-expanded variables. FIND is defined in Local.rules. CONTENT_FILES = $(shell $(FIND) . $(PRUNES) -o -name "*.content" -print) GENERATED_HTML_FILES = $(CONTENT_FILES:.content=.html) -VALIDATE_HTML_FILES = $(shell $(FIND) . $(PRUNES) -o -name "*.html" -print) +VALIDATE_HTML_FILES = $(shell $(FIND) . $(PRUNES) -o -name "*.html" -print) $(GENERATED_HTML_FILES) # Some prerequisites we use. @@ -61,15 +61,15 @@ include Local.rules.mk # all: validate # Just generate .html from .content without validate until validation # is working incrementally again. -all: validate namazu-re-index +# APA: Must touch $(STAMPS)/htdocs as well since validation updates +# dependencies of $(STAMPS)/htdocs +all: htdocs namazu-re-index everything: validate Download/win32 namazu-re-index -validate: htdocs $(STAMPS)/validate +validate: htdocs $(ELCS) $(STAMPS)/validate -htdocs: $(GENERATED_HTML_FILES) - -$(GENERATED_HTML_FILES): $(ELCS) $(STAMPS)/htdocs +htdocs: $(STAMPS)/htdocs # APA: Run linklint on the local working directory tree, including # remote link checking (-net). @@ -90,8 +90,10 @@ linklint: # APA: The genpage/content/index.content is not the only dependency, # but any improvements should go into the genpage/Makefile itself and # be integrated with a genpage release. -init: $(STAMPS)/init - rm $(STAMPS)/init +init: + if test ! -d $(STAMPS); then \ + $(MKDIR) $(STAMPS); \ + fi; if test ! -d logs; then \ mkdir logs; \ fi; @@ -104,13 +106,12 @@ init: $(STAMPS)/init cd genpage; $(MAKE) gp cd Texi2html; bash configure; make cd FAQ; $(MAKE) - touch $(STAMPS)/init # APA: When contentdir and outputdir are the same then, and only then, # genpage depends only on content files. Copying of all other files # (from contentdir to outputdir) is not necessary in this case. # See $(GENPAGE_CONF). -$(STAMPS)/htdocs: $(STAMPS) $(CONTENT_FILES) \ +$(STAMPS)/htdocs: $(CONTENT_FILES) \ template.html \ template-de.html \ template-ja.html \ @@ -121,7 +122,7 @@ $(STAMPS)/htdocs: $(STAMPS) $(CONTENT_FI Download/win32/netinstall-win32.txt \ Download/win32/innosetup-win32.txt \ Download/win32/installshield-win32.txt - perl ./genpage/bin/genpage -q -p $(GENPAGE_CONF) -o "." + perl ./genpage/bin/genpage -p $(GENPAGE_CONF) -o "." touch $(STAMPS)/htdocs # APA: Validate only files younger than time-stamp file created by @@ -137,27 +138,30 @@ $(STAMPS)/htdocs: $(STAMPS) $(CONTENT_FI # already made all the needed HTML by the time the arguments to # batch-psgml-validate are computed. # The conditional is to avoid doing the find in the toplevel make. -$(STAMPS)/validate: $(STAMPS) $(VALIDATE_HTML_FILES) - make real-validate SUBMAKE=validate +# APA: Must touch $(STAMPS)/htdocs as well since validation updates +# dependencies of $(STAMPS)/htdocs +$(STAMPS)/validate: $(VALIDATE_HTML_FILES) + rm -f VALIDATE_HTML_FILES.txt + touch VALIDATE_HTML_FILES.txt + 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 touch $(STAMPS)/validate -ifeq ($(SUBMAKE),validate) -# We'd like to use VALIDATE_HTML_FILES or $<, but we've got too many of them. -# (Limit on line length in shell.) So we run the find again here with xargs. -real-validate: $(VALIDATE_HTML_FILES) - $(FIND) . $(PRUNES) -o -name "*.html" -print \ - | xargs $(XEMACS) $(FLAGS) -l ./batch-psgml-validate.elc \ - -f batch-psgml-validate -endif # PB: target for rebuilding the namazu index # APA: Touch index.html for index template files to be re-generated. # www.xemacs.org has a patched mknmz that will update index files, # unless they are newer than the associated template. +# APA: Must touch $(STAMPS)/... as well since indexing updates +# dependencies of $(STAMPS)/... namazu-re-index: 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 # APA: Remove all .html files (and backups) generated from .content # files. Need to remove timestamp files as well! @@ -178,7 +182,8 @@ Download/win32: # Scaffolding -$(STAMPS): - $(MKDIR) $(STAMPS) +# APA: A directory as dependency will always trigger the rule (cygwin, linux). +# $(STAMPS): +# $(MKDIR) $(STAMPS) # End of xemacsweb Makefile