Author: paul
Date: 2006-12-06 19:46:54 +0100 (Wed, 06 Dec 2006)
New Revision: 4136
Log:
r16775@polar: paul | 2006-12-06 12:43:14 -0600
Parameterize name of the CSS file in make target rules so
that individual Makefiles can override it to use a different file.
(Needed to implement GUI tools help files)
Modified:
trunk/make.d/vars-docbook
trunk/make.d/xml-html-chapter
trunk/make.d/xml-html-dir
trunk/make.d/xml-html-section
trunk/make.d/xml-xhtml-chapter
trunk/make.d/xml-xhtml-dir
trunk/make.d/xml-xhtml-section
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16770
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13158
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12611
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16775
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13158
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12611
Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/vars-docbook 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 4; 1574 bytes
@@ -32,6 +32,10 @@
GENERATE_TOC_SECTION_TYPE ?= 1
+# The default CSS file to use for HTML output.
+
+HTML_CSS_FILE ?= $(XSL_DIR)/mysql-html.css
+
# ----------------------------------------------------------------------
# Stylesheet variables
@@ -209,14 +213,14 @@
MYSQL_HTML_XSL = $(XSL_DIR)/mysql-html.xsl
MYSQL_HTML_XSL_DEPS = $(MYSQL_HTML_XSL) \
- $(XSL_DIR)/mysql-html.css
+ $(HTML_CSS_FILE)
# Driver stylesheet for Docbook -> HTML, one file per chapter or section
MYSQL_HTML_SECTION_XSL = $(XSL_DIR)/mysql-html-section.xsl
MYSQL_HTML_SECTION_XSL_DEPS = $(MYSQL_HTML_SECTION_XSL) \
$(XSL_DIR)/mysql-disclaimer-html.xsl \
- $(XSL_DIR)/mysql-html.css
+ $(HTML_CSS_FILE)
# Driver stylesheet for Docbook -> HTML Help, one file per chapter or section
@@ -245,13 +249,15 @@
# Driver stylesheet for Docbook -> XHTML, single file
MYSQL_XHTML_XSL = $(XSL_DIR)/mysql-xhtml.xsl
-MYSQL_XHTML_XSL_DEPS = $(MYSQL_XHTML_XSL)
+MYSQL_XHTML_XSL_DEPS = $(MYSQL_XHTML_XSL) \
+ $(HTML_CSS_FILE)
# Driver stylesheet for Docbook -> XHTML, one file per chapter or section
MYSQL_XHTML_SECTION_XSL = $(XSL_DIR)/mysql-xhtml-section.xsl
MYSQL_XHTML_SECTION_XSL_DEPS = $(MYSQL_XHTML_SECTION_XSL) \
- $(XSL_DIR)/mysql-disclaimer-xhtml.xsl
+ $(XSL_DIR)/mysql-disclaimer-xhtml.xsl \
+ $(HTML_CSS_FILE)
# Driver stylesheet for Docbook -> HTML, one file per chapter or section
Modified: trunk/make.d/xml-html-chapter
===================================================================
--- trunk/make.d/xml-html-chapter 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/xml-html-chapter 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 756 bytes
@@ -11,7 +11,7 @@
mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --stringparam html.stylesheet 'mysql-html.css' \
+ --stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--param chunk.section.depth 0 \
--output $@-tmp/ \
$(MYSQL_HTML_SECTION_XSL) \
@@ -22,7 +22,7 @@
cp $$IMAGE_FILES $@-tmp/images; \
$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
- cp $(XSL_DIR)/mysql-html.css $@-tmp/mysql-html.css
+ cp $(HTML_CSS_FILE) $@-tmp
mv $@-tmp $@
clean::
Modified: trunk/make.d/xml-html-dir
===================================================================
--- trunk/make.d/xml-html-dir 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/xml-html-dir 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 714 bytes
@@ -10,7 +10,7 @@
mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --stringparam html.stylesheet 'mysql-html.css' \
+ --stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--output $@-tmp/$*.html \
$(MYSQL_HTML_XSL) \
$<
@@ -20,7 +20,7 @@
cp $$IMAGE_FILES $@-tmp/images; \
$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
- cp $(XSL_DIR)/mysql-html.css $@-tmp/mysql-html.css
+ cp $(HTML_CSS_FILE) $@-tmp
mv $@-tmp $@
clean::
Modified: trunk/make.d/xml-html-section
===================================================================
--- trunk/make.d/xml-html-section 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/xml-html-section 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 725 bytes
@@ -8,7 +8,7 @@
mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --stringparam html.stylesheet 'mysql-html.css' \
+ --stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--output $@-tmp/ \
$(MYSQL_HTML_SECTION_XSL) \
$<
@@ -18,7 +18,7 @@
cp $$IMAGE_FILES $@-tmp/images; \
$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
- cp $(XSL_DIR)/mysql-html.css $@-tmp/mysql-html.css
+ cp $(HTML_CSS_FILE) $@-tmp
mv $@-tmp $@
clean::
Modified: trunk/make.d/xml-xhtml-chapter
===================================================================
--- trunk/make.d/xml-xhtml-chapter 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/xml-xhtml-chapter 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 657 bytes
@@ -11,6 +11,7 @@
mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--param chunk.section.depth 0 \
--output $@-tmp/ \
$(MYSQL_XHTML_SECTION_XSL) \
@@ -21,6 +22,7 @@
cp $$IMAGE_FILES $@-tmp/images; \
$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
+ cp $(HTML_CSS_FILE) $@-tmp
mv $@-tmp $@
clean::
Modified: trunk/make.d/xml-xhtml-dir
===================================================================
--- trunk/make.d/xml-xhtml-dir 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/xml-xhtml-dir 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 616 bytes
@@ -10,6 +10,7 @@
mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--output $@-tmp/$*.xhtml \
$(MYSQL_XHTML_XSL) \
$<
@@ -19,6 +20,7 @@
cp $$IMAGE_FILES $@-tmp/images; \
$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
+ cp $(HTML_CSS_FILE) $@-tmp
mv $@-tmp $@
clean::
Modified: trunk/make.d/xml-xhtml-section
===================================================================
--- trunk/make.d/xml-xhtml-section 2006-12-06 17:27:28 UTC (rev 4135)
+++ trunk/make.d/xml-xhtml-section 2006-12-06 18:46:54 UTC (rev 4136)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 626 bytes
@@ -8,6 +8,7 @@
mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
+ --stringparam html.stylesheet $(notdir $(HTML_CSS_FILE)) \
--output $@-tmp/ \
$(MYSQL_XHTML_SECTION_XSL) \
$<
@@ -17,6 +18,7 @@
cp $$IMAGE_FILES $@-tmp/images; \
$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
+ cp $(HTML_CSS_FILE) $@-tmp
mv $@-tmp $@
clean::
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4136 - in trunk: . make.d | paul | 6 Dec |
