[Openmcl-cvs-notifications] r8574 - in /trunk/source/doc/src: Makefile.fedora Makefile.leopard Makefile.macports makehtml
rme at clozure.com
rme at clozure.com
Fri Feb 22 23:12:41 EST 2008
Author: rme
Date: Fri Feb 22 23:12:41 2008
New Revision: 8574
Log:
Yet more makefile fiddling.
Makefile.macports is for Mac OS X users. It assumes that you will install
MacPorts, and use "port install docbook-xsl" and "port install docbook-xml".
Removed:
trunk/source/doc/src/Makefile.leopard
Modified:
trunk/source/doc/src/Makefile.fedora
trunk/source/doc/src/Makefile.macports
trunk/source/doc/src/makehtml
Modified: trunk/source/doc/src/Makefile.fedora
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/doc/src/Makefile.fedora (original)
+++ trunk/source/doc/src/Makefile.fedora Fri Feb 22 23:12:41 2008
@@ -54,8 +54,7 @@
=
# Compute some targets.
=
-#XMLFILES =3D $(shell find . -name "*.xml")
-XMLFILES =3D [0-9][0-9]-*.xml ccl-documentation.xml
+XMLFILES =3D $(wildcard [0-9][0-9]-*.xml) ccl-documentation.xml
XSLFILES =3D $(shell find xsl -name "*.xsl")
#HTMLFILES =3D $(patsubst %.xml,%.html, $(XMLFILES))
HTMLFILES =3D ccl-documentation.html
Removed: trunk/source/doc/src/Makefile.leopard
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/doc/src/Makefile.leopard (original)
+++ trunk/source/doc/src/Makefile.leopard (removed)
@@ -1,98 +1,0 @@
-# -*- coding: unix -*-
-# Use xsltproc and an XSL stylesheet to translate DocBook XML to HTML
-# This require GNU "make", GNU "tar", Posix "find", Posix "date", and
-# "bzip2". All those external dependencies are, of course, less than
-# ideal.
-
-# for Linux (Fedora; other distros may require some tweaking.)
-
-# The pathname to the xsltproc executable. Since most alternate
-# translators use Java, this makefile would need to be rewritten to use
-# anything but xsltproc.
-
-XSLTPROC =3D /usr/bin/xsltproc
-
-
-# On a new system or when using a new version of xsltproc or of the
-# stylesheet packages, it's a good idea to run with --load-trace and
-# peruse the output to make sure that none of the stylesheets are being
-# pulled over the network. It's a significant expense, compounded by
-# the fact that they aren't cached across invocations of xsltproc. If they
-# are, you should make sure that the correct catalog file is being used
-# (see below), and, if so, that its contents are correct.
-#EXTRAPARAMS=3D --load-trace
-EXTRAPARAMS=3D =
-
-# The catalog file tells the translator where to find XSL stylesheets on t=
he
-# local system. The first choice here is what should be used for builds
-# which are going to take place on the clozure.com server. The second is
-# for when you have installed docbook on OS X using the fink package manag=
er.
-# If neither applies, comment both out, and the translator will automagica=
lly
-# look on the web for the stylesheets, instead.
-
-# assumes that you've said "port install docbook-xml" and
-# "port install docbook-xsl" at some point...
-export XML_CATALOG_FILES =3D /opt/local/etc/xml/catalog
-
-# The local stylesheet imports the generic stylesheets and
-# sets some custom parameters.
-
-STYLESHEET =3D xsl/openmcl.xsl
-
-# Obtain a temporary ID to be used as the identifier of this invocation of
-# make.
-
-TEMP :=3D build-$(shell date +%s)
-
-# Save the current directory for use in the tarfile target.
-
-CWD :=3D $(shell pwd)
-
-# There's datestamps on the page; let's make sure they're in
-# UTC instead of local time.
-
-export TZ =3D UTC
-
-# Compute some targets.
-
-XMLFILES =3D ccl-documentation.xml $(shell find . -name "??-*.xml")
-XSLFILES =3D $(shell find xsl -name "*.xsl")
-#HTMLFILES =3D $(patsubst %.xml,%.html, $(XMLFILES))
-HTMLFILES =3D ccl-documentation.html
-
-# Save the xsltproc version string for use in debugging.
-
-XSLTPROCVERSION =3D $(shell $(XSLTPROC) --version | head -n 1)
-
-.PHONY: all clean distclean lint
-
-all: $(TEMP) $(HTMLFILES) distclean
-
-$(HTMLFILES): $(XMLFILES) $(XSLFILES) Makefile.leopard
- $(XSLTPROC) \
- --xinclude \
- --stringparam root.filename $(basename $(@F)) \
- --stringparam base.dir $(TEMP)/ \
- --stringparam openmcl.directory $(@D)/ \
- --stringparam onechunk 1 \
- --stringparam xsltproc.version "$(XSLTPROCVERSION)." \
- $(EXTRAPARAMS) \
- $(STYLESHEET) $<
- rm -f $(if $(findstring Doc, $(@D)), $(@D)/*.html, $@)
- mv $(TEMP)/*.html $(@D)/
-
-install: $(HTMLFILES)
- cp $(HTMLFILES) ../HTML
-
-$(TEMP):
- mkdir $(TEMP)
-
-lint:
- xmllint --noout --noent --nonet --xinclude ccl-documentation.xml
-
-clean:
- rm -rf build-*
-
-distclean: clean
- rm -f *~
-
Modified: trunk/source/doc/src/Makefile.macports
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/doc/src/Makefile.macports (original)
+++ trunk/source/doc/src/Makefile.macports Fri Feb 22 23:12:41 2008
@@ -10,7 +10,7 @@
# translators use Java, this makefile would need to be rewritten to use
# anything but xsltproc.
=
-XSLTPROC =3D /opt/local/bin/xsltproc
+XSLTPROC =3D /usr/bin/xsltproc
=
=
# On a new system or when using a new version of xsltproc or of the
@@ -20,18 +20,21 @@
# the fact that they aren't cached across invocations of xsltproc. If they
# are, you should make sure that the correct catalog file is being used
# (see below), and, if so, that its contents are correct.
+#
+# --nonet can also be useful.
+#
#EXTRAPARAMS=3D --load-trace
-EXTRAPARAMS=3D --xinclude --nonet
+EXTRAPARAMS=3D
=
# The catalog file tells the translator where to find XSL stylesheets on t=
he
-# local system. The first choice here is what should be used for builds
-# which are going to take place on the clozure.com server. The second is
-# for when you have installed docbook on OS X using the fink package manag=
er.
-# If neither applies, comment both out, and the translator will automagica=
lly
+# local system. The choice here assumes that you've installed MacPorts in
+# the default location, and run "port install docbook-xml" and
+# "port install docbook-xsl" at some point.
+
+# If not, comment this out, and the translator will automagically
# look on the web for the stylesheets, instead.
=
-
-export XML_CATALOG_FILES =3D xsl/catalog-macports
+export XML_CATALOG_FILES =3D /opt/local/etc/xml/catalog
=
# The local stylesheet imports the generic stylesheets and
# sets some custom parameters.
@@ -54,10 +57,8 @@
=
# Compute some targets.
=
-#XMLFILES =3D $(shell find . -name "*.xml")
-XMLFILES =3D [0-9][0-9]-*.xml ccl-documentation.xml
+XMLFILES =3D $(wildcard [0-9][0-9]-*.xml) ccl-documentation.xml
XSLFILES =3D $(shell find xsl -name "*.xsl")
-#HTMLFILES =3D $(patsubst %.xml,%.html, $(XMLFILES))
HTMLFILES =3D ccl-documentation.html
=
# Save the xsltproc version string for use in debugging.
@@ -70,7 +71,7 @@
=
include makehtml
=
-install: $(HTMLFILES)
+install: $(HTMLFILES) distclean
cp $(HTMLFILES) ../HTML
=
$(TEMP):
@@ -80,9 +81,5 @@
rm -rf build-*
=
distclean: clean
- -find . -type f -name "*~" | xargs rm
+ rm -f *~
=
-# All this rigamarole is to make the pathnames stored in the tarfile
-# have a uniform prefix regardless of where the build directory actually
-# is. Somebody, please tell me I have overlooked something obvious.
-
Modified: trunk/source/doc/src/makehtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/doc/src/makehtml (original)
+++ trunk/source/doc/src/makehtml Fri Feb 22 23:12:41 2008
@@ -1,5 +1,6 @@
-%.html:%.xml $(XSLFILES) Makefile.fedora
+%.html:%.xml $(XSLFILES)
$(XSLTPROC) \
+ --xinclude \
--stringparam root.filename $(basename $(@F)) \
--stringparam base.dir $(TEMP)/ \
--stringparam openmcl.directory $(@D)/ \
More information about the Openmcl-cvs-notifications
mailing list