From: paul
Date: August 20 2007 8:01pm
Subject: svn commit - mysqldoc@docsrva: r7478 - in trunk: . make.d
List-Archive: http://lists.mysql.com/commits/32774
Message-Id: <200708202001.l7KK1kGF005375@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: paul
Date: 2007-08-20 22:01:46 +0200 (Mon, 20 Aug 2007)
New Revision: 7478

Log:
 r23872@frost:  paul | 2007-08-20 13:51:09 -0500
 Use xsltproc as a separate command, not in a pipeline, so that errors
 cause target rule to quit. (In a pipeline, non-{0,1} exit status might
 not abort attempt to build target, at least on some platforms.)


Modified:
   trunk/make.d/xml-prep

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:28858
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23833
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:28858
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23872
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696


Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep	2007-08-20 20:00:56 UTC (rev 7477)
+++ trunk/make.d/xml-prep	2007-08-20 20:01:46 UTC (rev 7478)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 12; 2135 bytes

@@ -23,10 +23,11 @@
 		--stringparam repository.revision "`$(GET_SVN_REVISION)`" \
 		--param map.remark.to.para $(MAP_REMARK_TO_PARA) \
 		--stringparam qandaset.style "$(QANDASET_STYLE)" \
-		$(DBK_PREP_XSL) $< | $(BUG_PREP) > $@.tmp
+		$(DBK_PREP_XSL) $< > $@.tmp2
+	$(BUG_PREP) < $@.tmp2 > $@.tmp
 ifdef IDMAP_REFS
-	$(IDREMAP) --srcpath="$(IDMAP_REFS)" $@.tmp > $@.xprep
-	mv $@.xprep $@
+	$(IDREMAP) --srcpath="$(IDMAP_REFS)" $@.tmp > $@.tmp2
+	mv $@.tmp2 $@
 	$(RM) $@.tmp
 else
 	mv $@.tmp $@

@@ -39,10 +40,11 @@
 %-remprepped.xml: %.xml $(DBK_PREP_XSL_DEPS) $(GET_SVN_REVISION) $(BUG_PREP)
 	$(XSLTPROC) \
 		--stringparam repository.revision "`$(GET_SVN_REVISION)`" \
-		$(DBK_PREP_XSL) $< | $(BUG_PREP) > $@.tmp
+		$(DBK_PREP_XSL) $< > $@.tmp2
+	$(BUG_PREP) < $@.tmp2 > $@.tmp
 ifdef IDMAP_REFS
-	$(IDREMAP) --srcpath="$(IDMAP_REFS)" $@.tmp > $@.xprep
-	mv $@.xprep $@
+	$(IDREMAP) --srcpath="$(IDMAP_REFS)" $@.tmp > $@.tmp2
+	mv $@.tmp2 $@
 	$(RM) $@.tmp
 else
 	mv $@.tmp $@

@@ -56,19 +58,20 @@
 		--stringparam repository.revision "`$(GET_SVN_REVISION)`" \
 		--param map.refentry.to.section 0 \
 		--stringparam qandaset.style "$(QANDASET_STYLE)" \
-		$(DBK_PREP_XSL) $< | $(BUG_PREP) > $@.tmp
+		$(DBK_PREP_XSL) $< > $@.tmp2
+	$(BUG_PREP) < $@.tmp2 > $@.tmp
 ifdef IDMAP_REFS
-	$(IDREMAP) --srcpath="$(IDMAP_REFS)" $@.tmp > $@.xprep
-	mv $@.xprep $@
+	$(IDREMAP) --srcpath="$(IDMAP_REFS)" $@.tmp > $@.tmp2
+	mv $@.tmp2 $@
 	$(RM) $@.tmp
 else
 	mv $@.tmp $@
 endif
 
 clean::
-	$(RM) *-prepped.xml *-prepped.xml.tmp *-prepped.xml.xprep
-	$(RM) *-remprepped.xml *-remprepped.xml.tmp *-remprepped.xml.xprep
-	$(RM) *-manprepped.xml *-manprepped.xml.tmp *-manprepped.xml.xprep
+	$(RM) *-prepped.xml *-prepped.xml.tmp *-prepped.xml.tmp2
+	$(RM) *-remprepped.xml *-remprepped.xml.tmp *-remprepped.xml.tmp2
+	$(RM) *-manprepped.xml *-manprepped.xml.tmp *-manprepped.xml.tmp2
 
 help::
 	@echo "make file-prepped.xml     - preprocess file.xml for producing output"