Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3657 05/09/30 18:19:02 paul@stripped +1 -0
Makefile:
Remove XML-related stuff (which we no longer use in this
directory), except for what's related to Texinfo -> DocBook
conversion.
Docs/Makefile
1.46 05/09/30 18:18:12 paul@stripped +1 -209
Remove XML-related stuff (which we no longer use in this
directory), except for what's related to Texinfo -> DocBook
conversion.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: frost.snake.net
# Root: /Users/paul/bk/mysqldoc
--- 1.45/Docs/Makefile 2005-09-26 13:28:36 -05:00
+++ 1.46/Docs/Makefile 2005-09-30 18:18:12 -05:00
@@ -14,48 +14,22 @@
TOOLS_DIR = ../tools
XSL_DIR = ../xsl.d
-# The DOCBOOK_XSL string must be mapped in your XML catalog file to the
-# root directory of your local DocBook XSL files. For example, you might
-# have a catalog entry that looks like this:
-# <rewriteSystem
-# systemIdStartString="mysqldoc://xsl-current/"
-# rewritePrefix="file:///usr/local/sgml/docbook-xsl-1.65.1/" />
-
-# Note: If xsltproc cannot find your stylesheets, set your XML_CATALOG_FILES
-# environment variable to point to a catalog file that provides pathnames
-# that are correct for your system.
-
-DOCBOOK_XSL = mysqldoc://xsl-current
-
# XSLT processor:
# --xinclude: The input might be split among several files
# --novalid: None of the transformation targets require validation (we assume
# the input has been validated).
-# XSLTPROC_EXTRA_FLAGS: normally unset, but you can pass a value for it
-# on the make command line to add extra xsltproc flags. This is used by
-# the chapterfmt.pl script to set the rootid parameter that tells xsltproc
-# to format a single chapter.
-
-XSLTPROC = xsltproc --xinclude --novalid $(XSLTPROC_EXTRA_FLAGS)
-
-XMLFORMAT = $(TOOLS_DIR)/manual-helper-prettyprint.pl \
- --config-file=$(TOOLS_DIR)/xmlformat.conf -i
-# Transform to prep a file for further formatting
-DBK_PREP_XSL = $(XSL_DIR)/dbk-prep.xsl
+XSLTPROC = xsltproc --xinclude --novalid
# The .PRECIOUS lines in this Makefile cause the named targets not to be
# deleted when they are generated as intermediates for a final target.
# To delete the precious targets, use "make clean".
-#
-.PRECIOUS: %-prepped.xml
LN = ln -s -f
RM = rm -f
TEXI2DB = $(TOOLS_DIR)/texi2db
TEXI2DB_POST_XSL = $(XSL_DIR)/texi2db-post.xsl
-MANUALIZE_CONNECTOR_DOC_XSL = $(XSL_DIR)/manualize-connector-doc.xsl
MANUAL_EN_BASE = manual-obsolete
MANUAL_DE_BASE = manual-de
@@ -75,35 +49,6 @@
@echo " make doc_name.txt"
@echo " make doc_name.info"
-CONNECTOR_NET_SRCS = \
- connector-net.xml \
- connector-net/changelog.xml
-
-connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
-
-# Validate an XML document
-
-%.valid: %.xml
- xmllint --xinclude --postvalid --noout --nonet $<
-
-# Reformat an XML document
-
-%.reformat: %.xml
- $(XMLFORMAT) $<
-
-# Prep an XML document for output formatting
-
-%-prepped.xml: %.xml $(DBK_PREP_XSL)
- $(XSLTPROC) --output $@ $(DBK_PREP_XSL) $<
-
-# This target builds all the files that are needed for inclusion
-# into MySQL distributions
-
-docs-dist:: \
- $(MANUAL_EN_BASE).html $(MANUAL_EN_BASE).txt mysql.info \
- $(INTERNALS_BASE).html $(INTERNALS_BASE).txt \
- $(INTERNALS_BASE).info \
- text-fragment-files
# Files included by main .texi files
MANUAL_SRCS = $(MANUAL_EN_BASE).texi include.texi reservedwords.texi \
@@ -157,140 +102,6 @@
%.info: %.texi
makeinfo --no-split -I . $<
-%.html: %-prepped.xml $(XSL_DIR)/mysql-html.xsl
- $(XSLTPROC) \
- --output $@ \
- $(XSL_DIR)/mysql-html.xsl \
- $<
-
-%.txt: %.html
- lynx -dump $< > $@
-
-# ----------------------------------------------------------------------
-
-# HTML per-section target rules
-
-# Generic rule for documents that have no special requirements
-
-%.html-section: %.html-section.d
- touch $@
-
-# Helper rule - this actually builds the HTML per-section output
-
-.PRECIOUS: %.html-section.d
-
-%.html-section.d: %-prepped.xml $(XSL_DIR)/mysql-html-section.xsl
- -$(RM) -r $@/
- mkdir $@/
- $(XSLTPROC) \
- --output $@/ \
- $(XSL_DIR)/mysql-html-section.xsl \
- $<
-
-# ----------------------------------------------------------------------
-
-# HTML per-chapter target rules (similar to per-section, but setting
-# chunk.section.depth to 0 causes chunking at the chapter level.
-
-
-# Generic rule for documents that have no special requirements
-
-%.html-chapter: %.html-chapter.d
- touch $@
-
-# Helper rule - this actually builds the HTML per-chapter output
-
-.PRECIOUS: %.html-chapter.d
-
-%.html-chapter.d: %-prepped.xml $(XSL_DIR)/mysql-html-section.xsl
- -$(RM) -r $@/
- mkdir $@/
- $(XSLTPROC) \
- --param chunk.section.depth 0 \
- --output $@/ \
- $(XSL_DIR)/mysql-html-section.xsl \
- $<
-
-# ----------------------------------------------------------------------
-
-# HTML Web target rules (for output published on mysql.com)
-
-# Generic rule for documents that have no special requirements
-
-%.html-web: %.html-web.d
- touch $@
-
-# Helper rule - this actually builds the HTML Web output
-
-.PRECIOUS: %.html-web.d
-
-%.html-web.d: %-prepped.xml $(XSL_DIR)/mysqlweb-chunk.xsl
- -$(RM) -r $@/
- mkdir $@/
- $(XSLTPROC) \
- --stringparam document.name.stem $* \
- --output $@/ \
- $(XSL_DIR)/mysqlweb-chunk.xsl \
- $<
-
-# ----------------------------------------------------------------------
-
-# HTML Help target rules
-
-# Generic rule for documents that have no special requirements
-
-%.html-help: %.html-help.d
- touch $@
-
-# Helper rule - this actually builds the HTML Help output
-
-.PRECIOUS: %.html-help.d
-
-%.html-help.d: %-prepped.xml $(XSL_DIR)/mysql-html-help.xsl
- -$(RM) -r $@/
- mkdir $@/
- $(XSLTPROC) \
- --output $@/ \
- $(XSL_DIR)/mysql-html-help.xsl \
- $<
-
-# ----------------------------------------------------------------------
-
-# HTML Help -> CHM conversion. The .html-help.d directory must already be
-# populated with all HTML files and any image and other files needed to
-# build the .chm file.
-# Note that the dependency is on the fake .html-help file, but the build-chm
-# script is passed the .html-help.d directory name.
-
-%.chm: %.html-help
- $(TOOLS_DIR)/build-chm $<.d $@
-
-# for page margins, note that you can't set left and right as they
-# will be overwritten. The default value is 1in for both.
-
-%.fo: %-prepped.xml $(XSL_DIR)/mysql-fo.xsl
- $(XSLTPROC) \
- --output $@ \
- $(XSL_DIR)/mysql-fo.xsl \
- $<
-
-%.a4.fo: %-prepped.xml $(XSL_DIR)/mysql-fo.xsl
- $(XSLTPROC) \
- --stringparam paper.type A4 \
- --output $@ \
- $(XSL_DIR)/mysql-fo.xsl \
- $<
-
-# Ignore error messages about hyphenation. FOP produces zillions of these
-# if it doesn't have hyphenation tables for a given language.
-# (Don't use grep to filter messages, because it returns non-zero if no
-# match is found, which causes the command to fail.)
-
-%.pdf: %.fo
- fop -q $< $*.pdf-tmp > $*.pdf-err
- mv $*.pdf-tmp $*.pdf
- sed -e '/hyphenation/d' < $*.pdf-err
- $(RM) $*.pdf-err
# Convert xxx.texi -> xxx.pre-xml -> xxx.texi-xml
@@ -317,19 +128,6 @@
%.texi-xml: %.pre-xml $(TEXI2DB_POST_XSL)
$(XSLTPROC) --output $@ $(TEXI2DB_POST_XSL) $<
-# Generic connector-doc manualizer
-
-%-manualized.xml: %.xml $(MANUALIZE_CONNECTOR_DOC_XSL)
- $(XSLTPROC) --output $@ $(MANUALIZE_CONNECTOR_DOC_XSL) $<
-
-# Manualizer for Connector/J doc
-
-connector-j-en-manualized.xml: connector-j-en.xml $(MANUALIZE_CONNECTOR_DOC_XSL)
- $(XSLTPROC) \
- --stringparam root.id.value "cj" \
- --stringparam root.title.text "MySQL Connector/J" \
- --output $@ $(MANUALIZE_CONNECTOR_DOC_XSL) $<
-
# Plain text files that need to be generated for inclusion with
# MySQL distributions. Each depends on manual.txt.
@@ -390,12 +188,6 @@
$(RM) $(INTERNALS_BASE).ky $(INTERNALS_BASE).log
$(RM) $(INTERNALS_BASE).pg $(INTERNALS_BASE).tp
$(RM) $(INTERNALS_BASE).toc $(INTERNALS_BASE).vr
- $(RM) *-prepped.xml
- $(RM) *.fo *.pdf *.pdf-tmp *.pdf-err *.html *.chm
- $(RM) -r *.html-chapter *.html-chapter.d
- $(RM) -r *.html-section *.html-section.d
- $(RM) -r *.html-help *.html-help.d
- $(RM) -r *.html-web *.html-web.d
$(RM) $(TEXT_FRAGMENT_FILES)
$(RM) prep_demo1 prep_demo1.o
$(RM) *.pre-xml *.texi-xml
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3657) | paul | 1 Oct |
