Commits

Anonymous committed 39b6ea5

xemacsweb: Makefile update by Ben

-------------------- ChangeLog entries follow: --------------------

ChangeLog addition:

2003-03-15 Adrian Aichner <adrian@xemacs.org>

* Local.rules.template (LINKLINT_CASE): New.
Order macro alternatives consistently.
* Makefile(linklint): Use LINKLINT_CASE. Add -output_index site.

2003-03-13 Ben Wing <ben@xemacs.org>

* Local.rules.mk:
* Local.rules.template:
* Makefile:
* Makefile (.SUFFIXES): Removed.
* Makefile (XEMACS): Removed.
* Makefile (FLAGS): Removed.
* Makefile (FIND): Removed.
* Makefile (LINKLINT): Removed.
* Makefile (LINKLINT_OUTDIR): Removed.
* Makefile (XEMACS_WEBSITE_BASE): New.
* Makefile (GENPAGE_CONF): Removed.
* Makefile (all): New.
* Makefile (ELCS): Removed.
* Makefile (CONTENT_FILES): Removed.
* Makefile (HTML_FILES): Removed.
* Makefile (NAMAZU_CGI): Removed.
* Makefile (MKNMZ): Removed.
* Makefile (NAMAZU_INDEX_DIR): Removed.
* Makefile (XEMACS_WEB_DIR): Removed.
Restructured the same way as the packages Makefile, with a
separate file containing user-specifiable values. Copy
into Local.rules and modify. Moved the user settings out of
Makefile and into Local.rules.template. Local.rules.mk is
almost identical to that in the package hierarchy except
for XEMACS_WEBSITE_BASE in place of XEMACS_PACKAGES_BASE.
(This variable is computed in Makefile)

* batch-psgml-validate.el (psgml-find-file-hook):
Fix compile warning.

Download/ChangeLog addition:

2003-03-13 Ben Wing <ben@xemacs.org>

* index.content: `binaries', not `binary-kits', is preferred.
Rewrite a bit the info on obtaining binaries on various
systems. Mention how to download Cygwin. Give more info
about Unix binaries. Change the title to "Downloading XEmacs"
rather than "XEmacs Downloading Locations".

  • Participants
  • Parent commits 58a61db

Comments (0)

Files changed (5)

+2003-03-15  Adrian Aichner  <adrian@xemacs.org>
+
+	* Local.rules.template (LINKLINT_CASE): New.
+	Order macro alternatives consistently.
+	* Makefile(linklint): Use LINKLINT_CASE.  Add -output_index site.
+
+2003-03-13  Ben Wing  <ben@xemacs.org>
+
+	* Local.rules.mk:
+	* Local.rules.template:
+	* Makefile:
+	* Makefile (.SUFFIXES): Removed.
+	* Makefile (XEMACS): Removed.
+	* Makefile (FLAGS): Removed.
+	* Makefile (FIND): Removed.
+	* Makefile (LINKLINT): Removed.
+	* Makefile (LINKLINT_OUTDIR): Removed.
+	* Makefile (XEMACS_WEBSITE_BASE): New.
+	* Makefile (GENPAGE_CONF): Removed.
+	* Makefile (all): New.
+	* Makefile (ELCS): Removed.
+	* Makefile (CONTENT_FILES): Removed.
+	* Makefile (HTML_FILES): Removed.
+	* Makefile (NAMAZU_CGI): Removed.
+	* Makefile (MKNMZ): Removed.
+	* Makefile (NAMAZU_INDEX_DIR): Removed.
+	* Makefile (XEMACS_WEB_DIR): Removed.
+	Restructured the same way as the packages Makefile, with a
+	separate file containing user-specifiable values.  Copy
+	into Local.rules and modify.  Moved the user settings out of
+	Makefile and into Local.rules.template.  Local.rules.mk is
+	almost identical to that in the package hierarchy except
+	for XEMACS_WEBSITE_BASE in place of XEMACS_PACKAGES_BASE.
+	(This variable is computed in Makefile)
+	
+	* batch-psgml-validate.el (psgml-find-file-hook):
+	Fix compile warning.
+
 2003-02-15  Adrian Aichner  <adrian@xemacs.org>
 
 	* index.content: Correct link text of http://www.isr.ist.utl.pt.

File Local.rules.mk

+# Include file for Local.rules.
+
+ifeq (${XEMACS_WEBSITE_BASE},)
+___:= $(error XEMACS_WEBSITE_BASE not defined??)
+endif
+
+___:= $(shell [ -f ${XEMACS_WEBSITE_BASE}/Local.rules ] && echo exists)
+
+Local.rules: ${XEMACS_WEBSITE_BASE}/Local.rules
+.PHONY: Local.rules
+
+${XEMACS_WEBSITE_BASE}/Local.rules: ${XEMACS_WEBSITE_BASE}/Local.rules.template
+ifneq (${___},exists)
+	command := $(shell cp -p $< $@)
+	$(error You must edit "$(notdir $@)" and customize it for this build host.)
+else
+	$(error "$(notdir $<)" has been updated or is newer than "$(notdir $@)".  Merge the changes into your "$(notdir $@)".)
+endif

File Local.rules.template

+# Local.rules - Site-Local definitions.
+
+# 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"
+# 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"
+
+# APA: Where to find and how to run linklint.
+LINKLINT=linklint
+# LINKLINT=perl linklint-2.3.6.d-adrian
+LINKLINT_OUTDIR=linklint
+# APA: Add -case switch on Windows to get correct filename case in
+# linklint log files.  This option causes error on UNIX.
+LINKLINT_CASE=
+# LINKLINT_CASE=-case
+
+GENPAGE_CONF="genpage.conf"
+
+ELCS=batch-psgml-validate.elc release-mail-to-html.elc
+
+# APA: Use these definitions for GNU make
+CONTENT_FILES=$(shell $(FIND) . -name "*.content" -print)
+# APA: We may need GENERATED_HTML_FILES later.  This syntax should
+# work with GNU- and Sun-make.
+# GENERATED_HTML_FILES=$(CONTENT_FILES:.content=.html)
+HTML_FILES=$(shell $(FIND) . -name "*.html" -print)
+
+# APA: Use these definitions for SUN make
+# CONTENT_FILES:sh=find . -name "*.content" -print
+# HTML_FILES:sh=find . -name "*.html" -print
+
+# Please add alternative definitions for CONTENT_FILES and HTML_FILES
+# if neither of the above work on your system.
+
+# PB: setup vars for namazu reindex
+# location of namazu.cgi
+# used for testing if this system has namazu installed
+NAMAZU_CGI=~/cgi-bin/namazu.cgi
+# mknmz command
+# used to reindex the site for namazu
+MKNMZ=mknmz
+# location of namazu index files
+NAMAZU_INDEX_DIR=~/var/namazu/index
+# website directory
+# need to make this more generic
+# ${PWD} doesnt seem to get set on www.xemacs.org
+XEMACS_WEB_DIR=~/xemacsweb
+
+#
+# Local Variables:
+# mode: makefile
+# End:
+#
 # all: creation and validation
 #
 
-.SUFFIXES:			# Delete the default suffixes
+# Use a Local.rules file to specify what you wish to have installed
+XEMACS_WEBSITE_BASE:= $(shell pwd)
+
+all: validate
+
+include Local.rules.mk
+-include Local.rules
+
+.SUFFIXES:			   # Delete the default suffixes
 .SUFFIXES: .content .html .el .elc # Define our suffix list
 
-# APA: This is what I use on my Windows 2000 machine:
-XEMACS=xemacs
-# XEMACS="//c/Program Files/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="//c/cygwin/bin/find.exe"
-
-# APA: Where to find and how to run linklint.
-LINKLINT=perl linklint-2.3.6.d-adrian
-# LINKLINT=linklint
-LINKLINT_OUTDIR=linklint
-
-GENPAGE_CONF="genpage.conf"
-
-ELCS=batch-psgml-validate.elc release-mail-to-html.elc
-
-# APA: Use these definitions for GNU make
-CONTENT_FILES=$(shell $(FIND) . -name "*.content" -print)
-# APA: We may need GENERATED_HTML_FILES later.  This syntax should
-# work with GNU- and Sun-make.
-# GENERATED_HTML_FILES=$(CONTENT_FILES:.content=.html)
-HTML_FILES=$(shell $(FIND) . -name "*.html" -print)
-
-# APA: Use these definitions for SUN make
-# CONTENT_FILES:sh=find . -name "*.content" -print
-# HTML_FILES:sh=find . -name "*.html" -print
-
-# Please add alternative definitions for CONTENT_FILES and HTML_FILES
-# if neither of the above work on your system.
-
-# PB: setup vars for namazu reindex
-# location of namazu.cgi
-# used for testing if this system has namazu installed
-NAMAZU_CGI=~/cgi-bin/namazu.cgi
-# mknmz command
-# used to reindex the site for namazu
-MKNMZ=mknmz
-# location of namazu index files
-NAMAZU_INDEX_DIR=~/var/namazu/index
-# website directory
-# need to make this more generic
-# ${PWD} doesnt seem to get set on www.xemacs.org
-XEMACS_WEB_DIR=~/xemacsweb
-
 # APA: Default target (first to occur in file):
 validate: htdocs validate-time-stamp
 
 
 # APA: Run linklint on the local working directory tree, including
 # remote link checking (-net).
-# Add -case switch on Windows to get correct filename case in linklint
-# log files.  This option causes error on UNIX.
+# Use -output_index site so that all files are reachable in directory
+# and not hidden by index.html, which does not reference url*.html
+# files.
 linklint: FORCE
-	$(LINKLINT) -docbase http://www.xemacs.org -net -limit 0 -db3 /@ -doc $(LINKLINT_OUTDIR)
+	$(LINKLINT) $(LINKLINT_CASE) -docbase http://www.xemacs.org -net -limit 0 -db3 /@ -doc $(LINKLINT_OUTDIR) -output_index site
 
 # APA: To be run after initial checkout of module.
 # Create directory for commit logs.

File batch-psgml-validate.el

   "Save last warning.")
 
 (defun psgml-find-file-hook ()
-  (condition-case error
+  (condition-case nil
       (save-excursion
         (let (mdo)
           (goto-char (point-min))