Author: paul
Date: 2006-07-22 07:57:05 +0200 (Sat, 22 Jul 2006)
New Revision: 2805
Log:
r11840@polar: paul | 2006-07-22 00:54:27 -0500
Consolidate make rules, rename files.
Added:
trunk/make.d/xml-chm
trunk/make.d/xml-info
Removed:
trunk/make.d/texi-info
trunk/make.d/xml-html-help
trunk/make.d/xml-texi
Modified:
trunk/administrator/Makefile
trunk/internals/Makefile
trunk/migration-toolkit/Makefile
trunk/mysqltest/Makefile
trunk/ndbapi/Makefile
trunk/proto-doc/Makefile
trunk/query-browser/Makefile
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
trunk/userguide/Makefile
trunk/workbench/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11839
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12594
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11840
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12594
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/administrator/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 665 bytes
@@ -42,11 +42,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
#include $(MAKE_DIR)/xml-txt
-#include $(MAKE_DIR)/xml-texi
-#include $(MAKE_DIR)/texi-info
+#include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/internals/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 648 bytes
@@ -45,11 +45,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Added: trunk/make.d/xml-chm
===================================================================
--- trunk/make.d/xml-chm (rev 0)
+++ trunk/make.d/xml-chm 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 48, Lines Deleted: 0; 1603 bytes
@@ -0,0 +1,48 @@
+# DocBook -> HTML Help -> CHM conversions
+
+# Convert DocBook -> HTML Help, with one file per section.
+# (Language sensitive)
+
+# Use html-section driver file, but set chunk.section.depth to 0,
+# causes chunking at the chapter level.
+
+# The %_SRCS variable must be set to the list of target dependencies.
+
+%.html-help: %-prepped.xml $(MYSQL_HTML_HELP_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ $(XSLTPROC) \
+ --stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --param chunk.section.depth 0 \
+ --output $@-tmp/ \
+ $(MYSQL_HTML_HELP_XSL) \
+ $<
+ IMAGE_FILES="$(call target_images,$*)"; \
+ if [ "x$$IMAGE_FILES" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $$IMAGE_FILES $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
+
+clean::
+ $(RM) -r *.html-help *.html-help-tmp
+
+
+# HTML Help -> CHM conversion. The .html-help directory must already be
+# populated with all HTML files and any image and other files needed to
+# build the .chm file.
+
+.PRECIOUS: %.html-help
+
+%.chm: %.html-help
+ $(TOOLS_DIR)/build-chm $< $@
+
+clean::
+ $(RM) *.chm
+
+help::
+ @echo "make file.html-help - convert file.xml to HTML Help, 1 file/chapter"
+ @echo " (used for generating CHM)"
+ @echo " (putting output in subdirectory)"
+ @echo "make file.chm - convert file.html-help to file.chm"
Added: trunk/make.d/xml-info
===================================================================
--- trunk/make.d/xml-info (rev 0)
+++ trunk/make.d/xml-info 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 24, Lines Deleted: 0; 882 bytes
@@ -0,0 +1,24 @@
+# Convert DocBook -> Texinfo
+# Convert Texinfo -> Info
+
+# This line causes files with the named extension not to be deleted when
+# they are generated as intermediates for producing a final target. They
+# are removed by "make clean".
+
+.PRECIOUS: %.texi
+
+%.texi: %-prepped.xml $(DBK_TEXI_XSL_DEPS) $(FIXUP_TEXI)
+ $(XSLTPROC) \
+ --stringparam l10n.gentext.default.language $(DOC_LANG) \
+ $(DBK_TEXI_XSL) $< | $(FIXUP_TEXI) > $@
+
+%.info: %.texi
+ makeinfo --no-split -I . $<
+
+clean::
+ $(RM) *.texi
+ $(RM) *.info
+
+help::
+ @echo "make file.texi - convert file.xml to file.texi"
+ @echo "make file.info - convert file.texi to file.info"
Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/migration-toolkit/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 677 bytes
@@ -42,11 +42,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
#include $(MAKE_DIR)/xml-txt
-#include $(MAKE_DIR)/xml-texi
-#include $(MAKE_DIR)/texi-info
+#include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/mysqltest/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 648 bytes
@@ -45,11 +45,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/ndbapi/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 643 bytes
@@ -43,11 +43,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-#include $(MAKE_DIR)/xml-texi
-#include $(MAKE_DIR)/texi-info
+#include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/proto-doc/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 3; 792 bytes
@@ -52,7 +52,7 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-xhtml-dir
include $(MAKE_DIR)/xml-xhtml-section
@@ -60,8 +60,7 @@
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-man
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/query-browser/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 665 bytes
@@ -42,11 +42,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
#include $(MAKE_DIR)/xml-txt
-#include $(MAKE_DIR)/xml-texi
-#include $(MAKE_DIR)/texi-info
+#include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/refman-4.1/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 714 bytes
@@ -116,13 +116,12 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml-dir
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-man
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/refman-5.0/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 714 bytes
@@ -116,13 +116,12 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml-dir
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-man
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/refman-5.1/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 714 bytes
@@ -116,13 +116,12 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml-dir
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-man
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/userguide/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 652 bytes
@@ -42,11 +42,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-#include $(MAKE_DIR)/xml-texi
-#include $(MAKE_DIR)/texi-info
+#include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile 2006-07-22 05:56:53 UTC (rev 2804)
+++ trunk/workbench/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 648 bytes
@@ -45,11 +45,10 @@
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
-include $(MAKE_DIR)/xml-html-help
+include $(MAKE_DIR)/xml-chm
include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
include $(MAKE_DIR)/xml-toc
include $(MAKE_DIR)/xml-txt
-include $(MAKE_DIR)/xml-texi
-include $(MAKE_DIR)/texi-info
+include $(MAKE_DIR)/xml-info
include $(MAKE_DIR)/xml-depend
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2805 - in trunk: . administrator internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browser refman-4.... | paul | 22 Jul |
