Commits

Anonymous committed 548e2f3

Subject: [PATCH] xemacsweb: turn validation on, partial Documentation/Makefile update

Comments (0)

Files changed (4)

+2009-12-11  Adrian Aichner  <adrian@xemacs.org>
+
+	* 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  <adrian@xemacs.org>
 
 	* Local.rules.mk (FLAGS): Kill XEmacs properly, load autoloads.

Documentation/ChangeLog

+2009-12-11  Adrian Aichner  <adrian@xemacs.org>
+
+	* 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  <adrian@xemacs.org>
 
 	* Makefile: Add rules beta-html and packages-html.

Documentation/Makefile

 # covers mule and non-mule packages
 PACKAGES_DIR = xemacs-packages
 STAGING = $(shell pwd)/packages
+REPOSITORY = :pserver:anonymous@cvs.alioth.debian.org:/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:cvs@cvs.xemacs.org:/pack/xemacscvs co -r $(BETA_TAG) -d $(BETA_DIR) xemacs/etc/photos; \
-		cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/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:cvs@cvs.xemacs.org:/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:cvs@cvs.xemacs.org:/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:cvs@cvs.xemacs.org:/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
 	if test ! -d $(SOURCES)/$(PACKAGES_DIR)/packages; then \
 		mkdir $(SOURCES); \
 		cd $(SOURCES); \
-		cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/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 \
 # 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
 
 
 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
 	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
 # 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!