COMMIT
Will test this on master websites now, after local testing on my
system at home.
Adrian
Documentation/ChangeLog addition:
2007-10-02 Adrian Aichner <adrian(a)xemacs.org>
* Makefile: Add rules beta-html and packages-html.
* .cvsignore: Add sources directory.
ChangeLog addition:
2007-10-02 Adrian Aichner <adrian(a)xemacs.org>
* Local.rules.template (TEXI2HTML): New definition to adapt to
local system.
* Local.rules.template (HTML_FILES): Fix and update for generated docs.
* Makefile (Documentation): New rule.
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: Documentation/Makefile
===================================================================
RCS Documentation/.cvsignore
===================================================================
RCS Makefile
===================================================================
RCS Local.rules.template
===================================================================
RCS
Index: Local.rules.template
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Local.rules.template,v
retrieving revision 1.7
diff -u -w -r1.7 Local.rules.template
--- Local.rules.template 11 Feb 2006 18:39:47 -0000 1.7
+++ Local.rules.template 2 Oct 2007 18:37:01 -0000
@@ -2,13 +2,14 @@
# APA: This is what I use on my Windows 2000 machine:
XEMACS=xemacs
-# XEMACS="/cygdrive/c/Program
Files/XEmacs/XEmacs-21.1.14/i386-pc-win32/xemacs.exe"
+# XEMACS=c:/PROGRA~1/XEmacs/XEmacs-21.1.14/i386-pc-win32/xemacs.exe
+# XEMACS=/cygdrive/c/PROGRA~1/XEmacs/XEmacs-21.1.14/i386-pc-win32/xemacs.exe
# FLAGS=-batch -q -no-site-file
FLAGS=-batch -vanilla
# APA: Windows has its own, inadequate find, use Cygwin instead!
FIND=find
-# FIND="/cygdrive/c/cygwin/bin/find.exe"
+# FIND=c:/cygwin/bin/find.exe
# APA: Where to find and how to run linklint.
LINKLINT=linklint
@@ -30,7 +31,7 @@
CONTENT_FILES=$(shell $(FIND) . -path ./genpage -prune -o -name "*.content"
-print)
GENERATED_HTML_FILES=$(CONTENT_FILES:.content=.html)
# APA: Files generated by texi2html do not need to be validated.
-HTML_FILES=$(shell $(FIND) . \( -path ./Documentation/21.5/html -o -path
./Documentation/packages/html -o -path "./linklint*" -prune \) -o -name
"*.html" -print)
+HTML_FILES=$(shell $(FIND) . \( -path "./Documentation/21.5/html/*" -o -path
"./Documentation/packages/html/*" -o -path "./linklint*" -o -path
"./Documentation/sources/*" -prune \) -o -name "*.html" -print)
# mknmz command
# used to reindex the site for namazu
@@ -38,6 +39,12 @@
# location of namazu index directory
# Only
www.xemacs.org is setup up for namazu indexing as of 2006-02-11.
NAMAZU_INDEX_DIR=/web/http-xemacs/var/namazu/index
+
+TEXI2HTML = texi2html
+#
www.xemacs.org:
+# TEXI2HTML = perl /web/http-xemacs/xemacsweb/Texi2html/texi2html
+# TANG:
+# TEXI2HTML=perl
"c:/Hacking/cvs.xemacs.org/XEmacs/xemacsweb/Texi2html/texi2html"
#
# Local Variables:
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Makefile,v
retrieving revision 1.55
diff -u -w -r1.55 Makefile
--- Makefile 11 Feb 2006 19:32:01 -0000 1.55
+++ Makefile 2 Oct 2007 18:37:01 -0000
@@ -114,6 +114,9 @@
rm -f htdocs-time-stamp
rm -f validate-time-stamp
+Documentation: FORCE
+ cd $@ && $(MAKE) TEXI2HTML="$(TEXI2HTML)" all
+
Download/win32: FORCE
cd $@ && $(MAKE)
Index: Documentation/.cvsignore
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Documentation/.cvsignore,v
retrieving revision 1.1
diff -u -w -r1.1 .cvsignore
--- Documentation/.cvsignore 2 Sep 2000 03:07:35 -0000 1.1
+++ Documentation/.cvsignore 2 Oct 2007 18:37:01 -0000
@@ -1 +1,2 @@
*.html
+sources
Index: Documentation/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Documentation/Makefile,v
retrieving revision 1.2
diff -u -w -r1.2 Makefile
--- Documentation/Makefile 23 Jun 2007 09:33:44 -0000 1.2
+++ Documentation/Makefile 2 Oct 2007 18:37:01 -0000
@@ -1,35 +1,65 @@
# Adrian Aichner (APA), Adrian.Aichner(a)T-Online.De,
XEmacs.Org, 2001-04-01.
-TEXI2HTML="perl ../../../Texi2html/texi2html -verbose -split chapter"
-
#
# Update BETA, GAMMA, and STABLE whenever new versions are released.
# Then Re-run make to build new online documentation.
#
-BETA = HEAD
-GAMMA = r21-4-6rc1
-STABLE = r21-1-14
-
-all: beta
-
-beta: $(BETA)
-gamma: $(GAMMA)
-stable: $(STABLE)
-# $(BETA):
-# cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs export -d beta -r $(BETA)
xemacs/man/term.texi xemacs/info
-# cd beta/xemacs/man && $(MAKE)
-
-$(BETA):
- cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs export -r $(BETA) -d beta
xemacs/man
- cd beta/man && $(MAKE) TEXI2HTML=$(TEXI2HTML) html
-
-$(GAMMA):
- cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs export -d gamma -r $(GAMMA)
xemacs/man
- cd gamma/man
+# 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
+# There is no GAMMA as of 2007-09-30
+GAMMA = r21-4-6rc1
+GAMMA_DIR = xemacs-21.4
+STABLE_TAG = r21-4-20
+STABLE_DIR = xemacs-21.4
+
+PACKAGES_TAG = HEAD
+# covers mule and non-mule packages
+PACKAGES_DIR = xemacs-packages
+STAGING = $(shell pwd)/packages
+
+all: beta-html 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; \
+ cd ..; \
+ else \
+ cd $(SOURCES)/$(BETA_DIR)/etc/photos; \
+ cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs 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; \
+ 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; \
+
+# 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:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs 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
-$(STABLE):
- cvs -f -z3 -d:pserver:cvs@cvs.xemacs.org:/pack/xemacscvs export -d stable -r $(STABLE)
xemacs/man
- cd stable/man
FORCE:
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches