Author: paul
Date: 2007-02-19 22:44:07 +0100 (Mon, 19 Feb 2007)
New Revision: 4993
Log:
r20104@polar: paul | 2007-02-19 15:41:44 -0600
Revised the "fragment" file generation process. Now we pull out only the
desired hunk of the manual directly (identifying it by its node id), rather
than converting the entire manual to text first and then looking for
beginning/ending section titles. This takes half the time, doesn't get
goofed up if we edit titles, and enables us to get rid of the
generate-text-files.pl script.
Removed:
trunk/tools/generate-text-files.pl
Modified:
trunk/make.d/fragments
trunk/make.d/vars-docbook
trunk/make.d/xml-html
trunk/make.d/xml-txt
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:20060
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:16410
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:20104
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:16410
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/make.d/fragments
===================================================================
--- trunk/make.d/fragments 2007-02-19 18:27:18 UTC (rev 4992)
+++ trunk/make.d/fragments 2007-02-19 21:44:07 UTC (rev 4993)
Changed blocks: 1, Lines Added: 41, Lines Deleted: 51; 3250 bytes
@@ -28,68 +28,58 @@
mkdir $@-tmp
cp $(FRAGMENT_FILES) $@-tmp
mv $@-tmp $@
+clean::
+ $(RM) -r fragments fragments-tmp
-INSTALL-SOURCE: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "Installing and Upgrading MySQL" \
- "MySQL Tutorial" \
- > $@
+INSTALL-SOURCE: node-installing.txt
+ cp $< $@
+clean::
+ $(RM) INSTALL-SOURCE node-installing.txt
-INSTALL-WIN-SOURCE: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "Installing MySQL from Source on Windows" \
- "Post-Installation Setup and Testing" \
- > $@
+INSTALL-WIN-SOURCE: node-windows-source-build.txt
+ cp $< $@
+clean::
+ $(RM) INSTALL-WIN-SOURCE node-windows-source-build.txt
-INSTALL-BINARY: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "Installing MySQL on Other Unix-Like Systems" \
- "MySQL Installation Using a Source Distribution" \
- > $@
+INSTALL-BINARY: node-installing-binary.txt
+ cp $< $@
+clean::
+ $(RM) INSTALL-BINARY node-installing-binary.txt
-COPYING: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "GNU General Public License" \
- "MySQL FLOSS License Exception" \
- > $@
+COPYING: node-gpl-license.txt
+ cp $< $@
+clean::
+ $(RM) COPYING node-gpl-license.txt
-EXCEPTIONS-CLIENT: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "MySQL FLOSS License Exception" \
- "Credits" \
- > $@
+EXCEPTIONS-CLIENT: node-mysql-floss-license-exception.txt
+ cp $< $@
+clean::
+ $(RM) EXCEPTIONS-CLIENT node-mysql-floss-license-exception.txt
-CHANGELOG: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "MySQL Change History" \
- "Limits and Restrictions" \
- > $@
+CHANGELOG: node-news.txt
+ cp $< $@
+clean::
+ $(RM) CHANGELOG node-news.txt
-ReadMe.txt: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "Installing MySQL on Mac OS X" \
- "Installing MySQL on Solaris" \
- > $@
+ReadMe.txt: node-mac-os-x-installation.txt
+ cp $< $@
+clean::
+ $(RM) ReadMe.txt node-mac-os-x-installation.txt
-ReadMe.html: $(MANUAL_SRCS)
- $(CHAPTERFMT) mac-os-x-installation.html
- mv mac-os-x-installation.html ReadMe.html
+ReadMe.html: node-mac-os-x-installation.html
+ cp $< $@
+clean::
+ $(RM) ReadMe.html node-mac-os-x-installation.html
-RELEASE-NOTES-ENTERPRISE: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "MySQL Enterprise Release Notes" \
- "MySQL Community Server Enhancements and Release Notes" \
- > $@
+RELEASE-NOTES-ENTERPRISE: node-releasenotes-es.txt
+ cp $< $@
+clean::
+ $(RM) RELEASE-NOTES-ENTERPRISE node-releasenotes-es.txt
-RELEASE-NOTES-COMMUNITY: manual.txt $(GENERATE_TEXT_FILES)
- $(GENERATE_TEXT_FILES) manual.txt \
- "MySQL Community Server Enhancements and Release Notes" \
- "MySQL Change History" \
- > $@
-
+RELEASE-NOTES-COMMUNITY: node-releasenotes-cs.txt
+ cp $< $@
clean::
- $(RM) $(FRAGMENT_FILES)
- $(RM) -r fragments fragments-tmp
+ $(RM) RELEASE-NOTES-COMMUNITY node-releasenotes-cs.txt
help::
@echo "make fragments - generate refman 'fragment' files"
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2007-02-19 18:27:18 UTC (rev 4992)
+++ trunk/make.d/vars-docbook 2007-02-19 21:44:07 UTC (rev 4993)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 533 bytes
@@ -138,10 +138,6 @@
CHAPTERFMT = $(TOOLS_DIR)/chapterfmt.pl
-# Script that extracts a piece of manual.txt
-
-GENERATE_TEXT_FILES = $(TOOLS_DIR)/generate-text-files.pl
-
# Script that updates $2 from $1 only if $1 is different from $2
# (helps prevent unnecessary updates to file-modification time of $2)
Modified: trunk/make.d/xml-html
===================================================================
--- trunk/make.d/xml-html 2007-02-19 18:27:18 UTC (rev 4992)
+++ trunk/make.d/xml-html 2007-02-19 21:44:07 UTC (rev 4993)
Changed blocks: 1, Lines Added: 31, Lines Deleted: 1; 1375 bytes
@@ -1,14 +1,44 @@
# Convert DocBook -> single HTML file
# (Language sensitive)
+# For the difference between the %.html and chapter-%.html rules,
+# read the comments in the xml-pdf file regarding formatting of
+# files that are subsidiary files in a larger document.
+
%.html: %-prepped.xml $(MYSQL_HTML_XSL_DEPS)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--output $@-tmp \
$(MYSQL_HTML_XSL) \
$<
- mv $@-tmp $@
+ mv $@-tmp $@
+# Format given chapter, part, or section file from entire document.
+
+chapter-%.html part-%.html section-%.html: \
+ $(MAIN_DOC_BASENAME)-prepped.xml \
+ $(MYSQL_HTML_XSL_DEPS)
+ $(XSLTPROC) \
+ --stringparam rootid "`$(GET_ROOTID) $*.xml`" \
+ --stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --output $@-tmp \
+ $(MYSQL_HTML_XSL) \
+ $<
+ mv $@-tmp $@
+
+# Format given arbitrary node from entire document.
+
+node-%.html: \
+ $(MAIN_DOC_BASENAME)-prepped.xml \
+ $(MYSQL_HTML_XSL_DEPS)
+ $(XSLTPROC) \
+ --stringparam rootid "$*" \
+ --stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --output $@-tmp \
+ $(MYSQL_HTML_XSL) \
+ $<
+ mv $@-tmp $@
+
clean::
$(RM) *.html *.html-tmp
Modified: trunk/make.d/xml-txt
===================================================================
--- trunk/make.d/xml-txt 2007-02-19 18:27:18 UTC (rev 4992)
+++ trunk/make.d/xml-txt 2007-02-19 21:44:07 UTC (rev 4993)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 2; 1279 bytes
@@ -32,15 +32,29 @@
# on the same line. (They are glued together with "@@", which then
# is mapped back after text conversion to ": ".)
-%.txt: %-nolink.xml
+%.txt: %-nolink.xml $(MYSQL_HTML_XSL_DEPS)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--stringparam generate.toc "" \
- --output $*-nolink.html $(MYSQL_HTML_XSL) \
+ --output $*-nolink.html \
+ $(MYSQL_HTML_XSL) \
$*-nolink.xml
$(HTML_TO_TEXT) $*-nolink.html | sed -e 's/@@http/: http/g' > $@-tmp
mv $@-tmp $@
+# Like previous rule, but format given arbitrary node from entire document.
+
+node-%.txt: $(MAIN_DOC_BASENAME)-nolink.xml $(MYSQL_HTML_XSL_DEPS)
+ $(XSLTPROC) \
+ --stringparam rootid "$*" \
+ --stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --stringparam generate.toc "" \
+ --output $*-nolink.html \
+ $(MYSQL_HTML_XSL) \
+ $<
+ $(HTML_TO_TEXT) $*-nolink.html | sed -e 's/@@http/: http/g' > $@-tmp
+ mv $@-tmp $@
+
# Do NOT include *.txt in the clean target. That's too common an
# extension, so it's not safe to go ahead and remove all .txt files.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4993 - in trunk: . make.d tools | paul | 19 Feb |
