List:Commits« Previous MessageNext Message »
From:paul Date:October 30 2007 8:11pm
Subject:svn commit - mysqldoc@docsrva: r8410 - in trunk: . mysqlqb
View as plain text  
Author: paul
Date: 2007-10-30 21:11:00 +0100 (Tue, 30 Oct 2007)
New Revision: 8410

Log:
 r31990@polar:  paul | 2007-10-30 15:09:44 -0500
 Generate dynamic file directly rather than copying it from elsewhere.


Modified:
   trunk/mysqlqb/Makefile

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


Modified: trunk/mysqlqb/Makefile
===================================================================
--- trunk/mysqlqb/Makefile	2007-10-30 20:10:47 UTC (rev 8409)
+++ trunk/mysqlqb/Makefile	2007-10-30 20:11:00 UTC (rev 8410)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 6; 983 bytes

@@ -57,15 +57,12 @@
 	cp $< $@
 all-entities.ent: $(REPO_ROOT)/refman-5.0/all-entities.ent
 	cp $< $@
-mysqlqb_functions.xml: $(REPO_ROOT)/refman-5.0/dynxml-local-functions.xml
-	cp $< $@
-	perl -pi.bak -e "s{functions-core.xml}{../refman-5.0/functions-core.xml}g" mysqlqb_functions.xml
+mysqlqb_functions.xml: $(REPO_ROOT)/refman-5.0/functions-core.xml
+	$(DYN_PARSER) --infile=$< --outfile=dynxml-local-functions.xml --srcdir=$(DYN_SRCDIR)
+	cp dynxml-local-functions.xml $@
 mysqlqb_statements.xml: $(REPO_ROOT)/refman-5.0/sql-syntax.xml
 	cp $< $@
 
-$(REPO_ROOT)/refman-5.0/dynxml-local-functions.xml:
-	make -C $(REPO_ROOT)/refman-5.0 dynxml-local-functions.xml
-
 mysqlqb.guihelp-toc: $(mysqlqb_SOURCES) $(XSL_DIR)/mysql-guihelp-toc.xsl
 	-$(RM) -r $@ $@-tmp
 	mkdir $@-tmp


Thread
svn commit - mysqldoc@docsrva: r8410 - in trunk: . mysqlqbpaul30 Oct