Author: paul
Date: 2007-01-22 19:32:34 +0100 (Mon, 22 Jan 2007)
New Revision: 4590
Log:
r15112@frost: paul | 2007-01-22 12:30:31 -0600
Rewrite target rules so that the output file does not appear until it
actually is complete. (Thus, killing a make job in the middle will not
spuriously cause an incomplete output file to exist.)
Modified:
trunk/make.d/xml-help
trunk/make.d/xml-html
trunk/make.d/xml-info
trunk/make.d/xml-pdf
trunk/make.d/xml-txt
trunk/make.d/xml-xhtml
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18625
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14920
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:18625
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:15112
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13520
Modified: trunk/make.d/xml-help
===================================================================
--- trunk/make.d/xml-help 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/make.d/xml-help 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 782 bytes
@@ -12,19 +12,20 @@
%-help.xml: %-prepped.xml $(MYSQL_HELP_PREP1_XSL_DEPS)
$(XSLTPROC) \
--stringparam doc.url.base $(DOC_URL_BASE) \
- --output $*-help.xml \
+ --output $@-tmp \
$(MYSQL_HELP_PREP1_XSL) \
$<
+ mv $@-tmp $@
%.help: %-help.xml $(MYSQL_HELP_PREP2_XSL_DEPS)
$(XSLTPROC) \
- --output $*.help \
+ --output $@-tmp \
$(MYSQL_HELP_PREP2_XSL) \
$<
+ mv $@-tmp $@
clean::
- $(RM) *-help.xml
- $(RM) *.help
+ $(RM) *-help.xml *-help.xml-tmp *.help *.help-tmp
help::
@echo "make file.help - extract help-table information from file.xml"
Modified: trunk/make.d/xml-html
===================================================================
--- trunk/make.d/xml-html 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/make.d/xml-html 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 564 bytes
@@ -4,12 +4,13 @@
%.html: %-prepped.xml $(MYSQL_HTML_XSL_DEPS)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@ \
+ --output $@-tmp \
$(MYSQL_HTML_XSL) \
$<
+ mv $@-tmp $@
clean::
- $(RM) *.html
+ $(RM) *.html *.html-tmp
help::
@echo "make file.html - convert file.xml to HTML, single file"
Modified: trunk/make.d/xml-info
===================================================================
--- trunk/make.d/xml-info 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/make.d/xml-info 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 585 bytes
@@ -9,13 +9,14 @@
%.texi: %-prepped.xml $(DBK_TEXI_XSL_DEPS) $(FIXUP_TEXI)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- $(DBK_TEXI_XSL) $< | $(FIXUP_TEXI) > $@
+ $(DBK_TEXI_XSL) $< | $(FIXUP_TEXI) > $@-tmp
+ mv $@-tmp $@
%.info: %.texi
makeinfo --no-split -I . $<
clean::
- $(RM) *.texi
+ $(RM) *.texi *.texi-tmp
$(RM) *.info
help::
Modified: trunk/make.d/xml-pdf
===================================================================
--- trunk/make.d/xml-pdf 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/make.d/xml-pdf 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 3; 1100 bytes
@@ -15,7 +15,8 @@
--output - $(STRIP_REMARKS_XSL) $< \
| $(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@ $(MYSQL_FO_XSL) -
+ --output $@-tmp $(MYSQL_FO_XSL) -
+ mv $@-tmp $@
%.a4.fo: %-prepped.xml $(MYSQL_FO_XSL_DEPS) $(STRIP_REMARKS_XSL_DEPS)
$(XSLTPROC) \
@@ -23,7 +24,8 @@
| $(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--stringparam paper.type A4 \
- --output $@ $(MYSQL_FO_XSL) -
+ --output $@-tmp $(MYSQL_FO_XSL) -
+ mv $@-tmp $@
# Ignore error messages about hyphenation. FOP produces zillions of these
# if it doesn't have hyphenation tables for a given language.
@@ -43,7 +45,7 @@
$(RM) $*.pdf-err
clean::
- $(RM) *.fo *.pdf *.pdf-tmp *.pdf-err *.multibyte
+ $(RM) *.fo *.fo-tmp *.pdf *.pdf-tmp *.pdf-err *.multibyte
help::
@echo "make file.pdf - convert file.xml to file.pdf (US letter)"
Modified: trunk/make.d/xml-txt
===================================================================
--- trunk/make.d/xml-txt 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/make.d/xml-txt 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 3; 1194 bytes
@@ -30,7 +30,8 @@
%-nolink.xml: %-prepped.xml %-toc-entries.xml $(EXPAND_LINKS_XSL_DEPS)
$(XSLTPROC) \
--stringparam toc.entry.file $$PWD/$*-toc-entries.xml \
- --output $@ $(EXPAND_LINKS_XSL) $*-prepped.xml
+ --output $@-tmp $(EXPAND_LINKS_XSL) $*-prepped.xml
+ mv $@-tmp $@
# Use standard HTML driver to convert -nolink.xml to HTML
# (with TOC suppressed), then use lynx to convert HTML to text.
@@ -45,13 +46,14 @@
--stringparam generate.toc "" \
--output $*-nolink.html $(MYSQL_HTML_XSL) \
$*-nolink.xml
- $(HTML_TO_TEXT) $*-nolink.html | sed -e 's/@@http/: http/g' > $@
+ $(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.
clean::
- $(RM) *-nolink.xml *-nolink.html
+ $(RM) *-nolink.xml *-nolink.xml-tmp *-nolink.html *.txt-tmp
help::
@echo "make file.txt - convert file.xml to file.txt"
Modified: trunk/make.d/xml-xhtml
===================================================================
--- trunk/make.d/xml-xhtml 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/make.d/xml-xhtml 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 574 bytes
@@ -4,12 +4,13 @@
%.xhtml: %-prepped.xml $(MYSQL_XHTML_XSL_DEPS)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@ \
+ --output $@-tmp \
$(MYSQL_XHTML_XSL) \
$<
+ mv $@-tmp $@
clean::
- $(RM) *.xhtml
+ $(RM) *.xhtml *.xhtml-tmp
help::
@echo "make file.xhtml - convert file.xml to XHTML, single file"
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/refman-4.1/Makefile 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 557 bytes
@@ -75,10 +75,11 @@
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
- $(FILL_HELP_TABLES2) manual.help > $@
+ $(FILL_HELP_TABLES2) manual.help > $@-tmp
+ mv $@-tmp $@
clean::
- $(RM) fill_help_tables.sql
+ $(RM) fill_help_tables.sql fill_help_tables.sql-tmp
# Import standard target rules
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/refman-5.0/Makefile 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 557 bytes
@@ -83,10 +83,11 @@
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
- $(FILL_HELP_TABLES2) manual.help > $@
+ $(FILL_HELP_TABLES2) manual.help > $@-tmp
+ mv $@-tmp $@
clean::
- $(RM) fill_help_tables.sql
+ $(RM) fill_help_tables.sql fill_help_tables.sql-tmp
# Import standard target rules
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2007-01-22 09:30:15 UTC (rev 4589)
+++ trunk/refman-5.1/Makefile 2007-01-22 18:32:34 UTC (rev 4590)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 557 bytes
@@ -81,10 +81,11 @@
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
- $(FILL_HELP_TABLES2) manual.help > $@
+ $(FILL_HELP_TABLES2) manual.help > $@-tmp
+ mv $@-tmp $@
clean::
- $(RM) fill_help_tables.sql
+ $(RM) fill_help_tables.sql fill_help_tables.sql-tmp
# Import standard target rules
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4590 - in trunk: . make.d refman-4.1 refman-5.0 refman-5.1 | paul | 22 Jan |
