Commits

Michael Sperber committed 822c038

Make HTML generation work post-CVS.

To that end, add subrepositories for the XEmacs sources and the
packages, and get the goods from there instead of from CVS.

  • Participants
  • Parent commits e42c8f7

Comments (0)

Files changed (8)

+Documentation/sources/xemacs = ../xemacs
+Documentation/sources/xemacs-packages = ../xemacs-packages
+07256dcc0c8ba58e01b74b30bd094d2f3915af2a Documentation/sources/xemacs
+0848aac19c4c5b9937f0c20eaf79bf4fbe84fc2a Documentation/sources/xemacs-packages

Documentation/ChangeLog

+2012-01-06  Michael Sperber  <mike@xemacs.org>
+
+	* Makefile (beta-html): Don't use CVS anymore; rely on the
+	provided subrepositories.
+
 2010-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* packageGuide.content: Shorten "under construction" apologetics.

Documentation/Makefile

 # Then Re-run make to build new online documentation.
 #
 
-# Need to insert directory level without CVS control files, so that
-# cvs update of working directory of xemacsweb CVS module will not
-# descend into working directories from xemacs and packages CVS
-# modules.
 SOURCES = sources
 
 BETA_TAG = HEAD
-BETA_DIR = xemacs-21.5
+BETA_DIR = xemacs
 # There is no GAMMA as of 2007-09-30
 GAMMA = r21-4-6rc1
 GAMMA_DIR = xemacs-21.4
 PACKAGES_TAG = HEAD
 # covers mule and non-mule packages
 PACKAGES_DIR = xemacs-packages
-STAGING = $(shell pwd)/packages
-REPOSITORY = :pserver:anonymous@cvs.alioth.debian.org:/cvsroot/xemacs
+STAGING = $(shell pwd)
 
-# 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
+all: beta-html packages-html
 
 beta-html:
-	if test ! -d $(SOURCES)/$(BETA_DIR)/man; then \
-		mkdir $(SOURCES); \
-		cd $(SOURCES); \
-		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 $(REPOSITORY) update -r $(BETA_TAG) -Pd; \
-		cd ../../../..; \
-		cd $(SOURCES)/$(BETA_DIR)/man; \
-		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 $(REPOSITORY) co -r $(PACKAGES_TAG) -N -d $(PACKAGES_DIR) packages; \
-
 # time will tell whether master websites need setups different from
 # Local.rules.template
 packages-html:
-	if test ! -d $(SOURCES)/$(PACKAGES_DIR)/packages; then \
-		mkdir $(SOURCES); \
-		cd $(SOURCES); \
-		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 \
-		cd $(SOURCES)/$(PACKAGES_DIR)/packages; \
-		cvs update; \
-		cd ../../..; \
-	fi;
-	cd $(SOURCES)/$(PACKAGES_DIR)/packages && $(MAKE) TEXI2HTML="$(TEXI2HTML)" XEMACS="$(XEMACS)" STAGING="$(STAGING)" install-html
+	cd $(SOURCES)/$(PACKAGES_DIR) && $(MAKE) TEXI2HTML="$(TEXI2HTML)" XEMACS="$(XEMACS)" STAGING="$(STAGING)" install-html
 
 
 FORCE:
+2012-01-06  Michael Sperber  <mike@xemacs.org>
+
+	* Makefile (xemacs-faq.texi): Don't rely on CVS; instead, rely on
+	the provided subrepositories.
+
 2004-12-08  Adrian Aichner  <adrian@xemacs.org>
 
 	* index.content: Point to updated FAQ Documentation.
 #
 # Adrian Aichner (APA), Adrian.Aichner@T-Online.De, XEmacs.Org, 2001-04-04.
 #
-# Generate XEmacs FAQ from latest CVS sources.
-# Checkout may need to use -r tag in the future, depending on the
-# version we want to put up on the website.
+# Generate XEmacs FAQ.
 #
 
 # FIND="//c/cygwin/bin/find.exe"
 
 all:
 
-xemacs-faq.texi: FORCE
-	cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs checkout -p xemacs/man/xemacs-faq.texi > xemacs-faq.texi
+xemacs-faq.texi: ../Documentation/sources/xemacs/man/xemacs-faq.texi
+	-cp $< $@
 
 xemacs-faq.dvi: xemacs-faq.texi
 	-$(TEXI2DVI) $?
 # is working incrementally again.
 # APA: Must touch $(STAMPS)/htdocs as well since validation updates
 # dependencies of $(STAMPS)/htdocs
-all: validate namazu-re-index
+all: FAQ Documentation validate namazu-re-index
 
-everything: validate Download/win32 namazu-re-index
+everything: validate FAQ Documentation Download/win32 namazu-re-index
 
 validate: htdocs $(ELCS) $(STAMPS)/validate
 
 Documentation:
 	cd $@ && $(MAKE) TEXI2HTML="$(TEXI2HTML)" all
 
+FAQ:
+	cd $@ && $(MAKE) TEXI2HTML="$(TEXI2HTML)" all
+
 Download/win32:
 	cd $@ && $(MAKE)
 

etc/rsync-filter.txt

 + /template*.html
 + /genpage/layout
 - /logs
-- /.hg
+- .hg
 - /Local.rules
 - *~
 - *.rej
 - /batch-psgml-validate.elc
 - /cgi-bin/.wilma
 #  Revisit:
-- /Documentation/sources
+- /Documentation/sources/xemacs-packages/Local.rules
 - /Documentation/packages/pkginfo
 - /linklint
 - /genpage/www
 - *.html
 - /build-url.txt
 - /VALIDATE_HTML_FILES.txt
+- /Texi2html/texi2html