svn commit - mysqldoc@docsrva: r5849 - in trunk: . make.d tools xsl.d

[paul]

Author: paul
Date: 2007-04-12 15:54:54 +0200 (Thu, 12 Apr 2007)
New Revision: 5849

Log:
 r18963@frost:  paul | 2007-04-12 08:52:05 -0500
 Remove vestiges of old CHM-building process:
 - Remove build-chm script
 - Drop the %.html-help make target rule and mysql-html-help.xsl XSL transform
 - Remove associated variable definitions


Removed:
   trunk/tools/build-chm
   trunk/xsl.d/mysql-html-help.xsl
Modified:
   trunk/make.d/vars-docbook
   trunk/make.d/xml-chm

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23190
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18904
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:23190
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18963
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593


Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook	2007-04-12 04:53:48 UTC (rev 5848)
+++ trunk/make.d/vars-docbook	2007-04-12 13:54:54 UTC (rev 5849)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 5; 632 bytes

@@ -241,11 +241,6 @@
 	$(XSL_DIR)/mysql.formalpara.templates.html.xsl \
 	$(HTML_CSS_FILE)
 
-# Driver stylesheet for Docbook -> HTML Help, one file per chapter or section
-
-MYSQL_HTML_HELP_XSL = $(XSL_DIR)/mysql-html-help.xsl
-MYSQL_HTML_HELP_XSL_DEPS = $(MYSQL_HTML_HELP_XSL)
-
 # Driver stylesheet for Docbook -> (kind of) HTML, one file per section
 
 # Pages include PHP code specific to mysql.com Web site.


Modified: trunk/make.d/xml-chm
===================================================================
--- trunk/make.d/xml-chm	2007-04-12 04:53:48 UTC (rev 5848)
+++ trunk/make.d/xml-chm	2007-04-12 13:54:54 UTC (rev 5849)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 46; 2127 bytes

@@ -1,52 +1,13 @@
-# DocBook -> HTML Help -> CHM conversions
+# DocBook -> CHM-input conversions
 
-# Convert DocBook -> HTML Help, with one file per section.
-# (Language sensitive)
-
-# Use html-section driver file, but set chunk.section.depth to 0,
-# which 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
-
 # Prepare CHM input that's ready to be copied to a Windows box and
 # used to produce a CHM document.
 # - CSS file
 # - Input source document (the "prepped" input renamed to source.xml)
 # - Any required image files
 
+# The %_SRCS variable must be set to the list of target dependencies.
+
 %.chm-input: %-prepped.xml
 	-$(RM) -r $@ $@-tmp
 	mkdir $@-tmp

@@ -64,8 +25,4 @@
 	$(RM) -r *.chm-input *.chm-input-tmp
 
 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"
 	@echo "make file.chm-input       - prepare input for Windows CHM build"