MySQL Lists: internals: bk commit - mysqldoc tree (paul:1.2429)

List:	Internals	« Previous Message Next Message »
From:	paul	Date:	December 6 2004 7:32pm
Subject:	bk commit - mysqldoc tree (paul:1.2429)
View as plain text
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.2429 04/12/06 12:32:14 paul@stripped +1 -0
  Makefile:
    Remove some vestigial junk.
    Other minor changes.

  DocsX/Makefile
    1.30 04/12/06 12:31:57 paul@stripped +30 -56
    Remove some vestigial junk.
    Other minor changes.

# 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:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.29/DocsX/Makefile	2004-12-03 08:51:28 -06:00
+++ 1.30/DocsX/Makefile	2004-12-06 12:31:57 -06:00
@@ -4,8 +4,6 @@
 #   in the manual.
 # - We need a way to specify the .info output file as a parameter when
 #   generating Info targets.
-# - Figure out how to format just a given chapter, but have the section
-#   numbering be correct (not begin at 1).  Use rootid?
 # - Use of $PWD in some of the rules is to give the XSL scripts that
 #   need to find -toc-entries.xml files an absolute pathname to work
 #   with. (Otherwise, they look in the same directory in which they
@@ -45,7 +43,7 @@
 #   make manual.html
 #   make manual.html-chapter   (one file/chapter)
 #   make manual.html-section   (one file/section)
-#   make manual.htmlhelp       (one file/section)
+#   make manual.html-help       (one file/section)
 #   make manual.txt
 
 # To work with a different language such as German, do this instead:
@@ -166,7 +164,6 @@
 # removed by "make clean".
 
 .PRECIOUS: %-dequoted.xml
-.PRECIOUS: %-fixlink.xml
 .PRECIOUS: %-nolink.xml
 .PRECIOUS: %-toc-entries.xml
 .PRECIOUS: %.texi
@@ -185,7 +182,7 @@
 	@echo "  make file-chapter.html  - create HTML document, 1 file/chapter"
 	@echo "  make file-section.html  - create HTML document, 1 file/section"
 	@echo "  make file.xhtml         - create XHTML document"
-	@echo "  make file.htmlhelp      - create HTML help document"
+	@echo "  make file.html-help     - create HTML Help document"
 	@echo "  make file.pdf           - create PDF document"
 	@echo "  make file.txt           - create plain text document"
 	@echo "  make file.texi          - create Texinfo document"
@@ -284,35 +281,22 @@
 %.info: %.texi
 	makeinfo --no-split -I . $<
 
-# Generate target that has <xref> elements fixed up to include
-# the proper cross-reference information in the body of the link.
-# This is an intermediate target for the .html, .xhtml, and .pdf
-# targets.  The DocBook stylesheets don't produce the proper
-# cross-reference format by default.
-
-%-fixlink.xml: %-dequoted.xml %-toc-entries.xml
-	$(XSLTPROC) \
-		--stringparam toc.entry.file $$PWD/$*-toc-entries.xml \
-		--output $@ $(FIXUP_LINKS_XSL) $*-dequoted.xml
-
 # Master rule for targets that are generated by using the DocBook XSL
 # stylesheets.  It figures out whether there is a language code in the
 # output target name, then invokes make recursively to build a -REAL
 # target that takes into account the language code.  (For example,
-# manual.html has no language code (meaning "English"), but manual.de.html
-# has a language code of "de".
+# manual.html has no language code (so it defaults to "English"), but
+# manual.de.html has a language code of "de".
 
 %.xhtml %.html %.html-section %.html-chapter \
-%.html-web %.htmlhelp %.fo: %-dequoted.xml
+%.html-web %.html-help %.fo: %-dequoted.xml
 	make $@-REAL xDOCBOOK_LANG=`expr "$*" : '.*\.\([a-z][a-z]*\)$$'`
 
-# Convert DocBook -> XHTML/HTML
-# - De-<quote> (handled implicitly as prerequisite to -fixlink target).
-# - Fix <xref> elements to contain full cross-reference text.
+# Convert DocBook -> single XHTML/HTML file
+# - De-<quote>
 # - Run through DocBook XHTML/HTML stylesheets
 # (Language sensitive)
 
-#%.xhtml: %-fixlink.xml %-toc-entries.xml
 %.xhtml-REAL: %-dequoted.xml
 	$(XSLTPROC) \
 		--stringparam l10n.gentext.default.language $(DOCBOOK_LANG) \
@@ -321,7 +305,6 @@
 		--output $*.xhtml $(DOCBOOK_XSL)/xhtml/docbook.xsl \
 		$<
 
-#%.html: %-fixlink.xml %-toc-entries.xml
 %.html-REAL: %-dequoted.xml
 	$(XSLTPROC) \
 		--stringparam l10n.gentext.default.language $(DOCBOOK_LANG) \
@@ -332,13 +315,9 @@
 		--output $*.html $(DOCBOOK_XSL)/html/docbook.xsl \
 		$<
 
-# Generate HTML, with one file per section, or one file per chapter.
-# Note that these targets always use the same subdirectory, so don't
-# try to create two per-section or two per-chapter documents at the
-# same time.
+# Convert DocBook -> HTML, with one file per section, or one file per chapter.
 # (Language sensitive)
 
-#%.html-section: %-fixlink.xml %-toc-entries.xml
 %.html-section-REAL: %-dequoted.xml
 	-$(RM) -r $*$(DOCBOOK_LANGSUFFIX).html-section/
 	mkdir $*$(DOCBOOK_LANGSUFFIX).html-section/
@@ -351,22 +330,9 @@
 		--output $*$(DOCBOOK_LANGSUFFIX).html-section/ \
 		$(DOCBOOK_XSL)/html/chunk.xsl $<
 
-# Generate (kind of) HTML, with one file per section.
-# (Language sensitive)
-
-#%.html-web: %-fixlink.xml %-toc-entries.xml
-%.html-web-REAL: %-dequoted.xml
-	-$(RM) -r html-web$(DOCBOOK_LANGSUFFIX)/
-	mkdir html-web$(DOCBOOK_LANGSUFFIX)/
-	$(XSLTPROC) \
-		--stringparam l10n.gentext.default.language $(DOCBOOK_LANG) \
-		--output html-web$(DOCBOOK_LANGSUFFIX)/ $(XSL_DIR)/mysqlweb-chunk.xsl \
-		$<
-
 # Setting chunk.section.depth to 0 causes chunking at the chapter level
 # (Language sensitive)
 
-#%.html-chapter: %-fixlink.xml %-toc-entries.xml
 %.html-chapter-REAL: %-dequoted.xml
 	-$(RM) -r $*$(DOCBOOK_LANGSUFFIX).html-chapter/
 	mkdir $*$(DOCBOOK_LANGSUFFIX).html-chapter/
@@ -380,30 +346,40 @@
 		--output $*$(DOCBOOK_LANGSUFFIX).html-chapter/ \
 		$(DOCBOOK_XSL)/html/chunk.xsl $<
 
-%.htmlhelp-REAL: %-dequoted.xml
-	-$(RM) -r $*$(DOCBOOK_LANGSUFFIX).htmlhelp/
-	mkdir $*$(DOCBOOK_LANGSUFFIX).htmlhelp/
+# Convert DocBook -> (kind of) HTML, with one file per section.
+# The output files contain TOC stuff suitable for use on mysql.com
+# (Language sensitive)
+
+%.html-web-REAL: %-dequoted.xml
+	-$(RM) -r html-web$(DOCBOOK_LANGSUFFIX)/
+	mkdir html-web$(DOCBOOK_LANGSUFFIX)/
+	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOCBOOK_LANG) \
+		--output html-web$(DOCBOOK_LANGSUFFIX)/ $(XSL_DIR)/mysqlweb-chunk.xsl \
+		$<
+
+# Convert DocBook -> HTML Help, with one file per section.
+# (Language sensitive)
+
+%.html-help-REAL: %-dequoted.xml
+	-$(RM) -r $*$(DOCBOOK_LANGSUFFIX).html-help/
+	mkdir $*$(DOCBOOK_LANGSUFFIX).html-help/
 	$(XSLTPROC) \
 		--stringparam l10n.gentext.default.language $(DOCBOOK_LANG) \
 		--param chapter.autolabel 1 \
 		--param appendix.autolabel 1 \
 		--param section.autolabel 1 \
 		--param section.label.includes.component.label 1 \
-		--output $*$(DOCBOOK_LANGSUFFIX).htmlhelp/ \
+		--output $*$(DOCBOOK_LANGSUFFIX).html-help/ \
 		$(DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl \
 		$<
 
-manual.htmlhelp.zip: manual.htmlhelp
-	zip -r manual.htmlhelp.zip manual.htmlhelp
-
 # Convert DocBook -> FO/PDF
 # - De-<quote>
-# - Fix <xref> elements to contain full cross-reference text.
 # - Run through DocBook FO stylesheets to generate FO.
 # - Use FOP to convert FO -> PDF.
 # (Language sensitive)
 
-#%.fo: %-fixlink.xml %-toc-entries.xml
 %.fo-REAL: %-dequoted.xml
 	$(XSLTPROC) --param fop.extensions 1 --novalid \
 		--stringparam l10n.gentext.default.language $(DOCBOOK_LANG) \
@@ -431,9 +407,9 @@
 
 # Convert DocBook -> plain text
 # - De-<quote> (handled implicitly as prerequisite to -nolink target).
-# - Expand <xref>, <ulink>, and <email> elements to inline text (we
+# - Expand <xref>, <ulink>, and <email> elements to inline text. (We
 #   want to avoid having lynx generate any footnotes to internal or
-#   external links.
+#   external links.)
 # - Format as HTML, but without any TOC (TOC is pointless because a
 #   text file has no way to use the TOC for jumping around in the
 #   document). Setting the generate.toc parameter to the empty string
@@ -509,12 +485,10 @@
 	$(RM) *-dequoted.xml
 	$(RM) *-toc-entries.xml
 	$(RM) *-nolink.xml *-nolink.html
-	$(RM) *-fixlink.xml
 	$(RM) *.toc
 	$(RM) *.texi
 	$(RM) *.info
 	$(RM) _xtmp1 _xtmp2
-	$(RM) -r *.html-section *.html-chapter* *.htmlhelp html-web*
-	$(RM) manual.htmlhelp.zip
+	$(RM) -r *.html-section *.html-chapter* *.html-help html-web*
 	$(RM) $(TEXT_FRAGMENT_FILES)
 	$(RM) Images
Thread
• bk commit - mysqldoc tree (paul:1.2429)	paul	6 Dec