From: Date: May 15 2007 6:27pm
Subject: svn commit - mysqldoc@docsrva: r6466 - in trunk: . gui-common gui-common-cy gui-common-ro make.d mysqlqb refman-common
List-Archive: http://lists.mysql.com/commits/26720
Message-Id: <200705151627.l4FGRD5M015040@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: paul
Date: 2007-05-15 18:27:10 +0200 (Tue, 15 May 2007)
New Revision: 6466

Log:
 r24974@polar:  paul | 2007-05-15 11:17:52 -0500
 Don't generate idmap files for -nolink.xml or prepped.xml files.


Modified:
   trunk/gui-common-cy/Makefile
   trunk/gui-common-ro/Makefile
   trunk/gui-common/Makefile
   trunk/make.d/vars-docbook
   trunk/mysqlqb/Makefile
   trunk/refman-common/Makefile

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


Modified: trunk/gui-common/Makefile
===================================================================
--- trunk/gui-common/Makefile	2007-05-15 16:11:05 UTC (rev 6465)
+++ trunk/gui-common/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 577 bytes

@@ -18,7 +18,7 @@
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../workbench ../query-browser ../administrator ../migration-toolkit ../refman-5.1 ../refman-common
-IDMAP_SRCS = $(wildcard *.xml)
+IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
 IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables


Modified: trunk/gui-common-cy/Makefile
===================================================================
--- trunk/gui-common-cy/Makefile	2007-05-15 16:11:05 UTC (rev 6465)
+++ trunk/gui-common-cy/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 589 bytes

@@ -18,7 +18,7 @@
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../workbench ../query-browser-cy ../administrator ../migration-toolkit ../refman-5.1 ../refman-common
-IDMAP_SRCS = $(wildcard *.xml)
+IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
 IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables


Modified: trunk/gui-common-ro/Makefile
===================================================================
--- trunk/gui-common-ro/Makefile	2007-05-15 16:11:05 UTC (rev 6465)
+++ trunk/gui-common-ro/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 586 bytes

@@ -18,7 +18,7 @@
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../workbench ../query-browser ../administrator ../migration-toolkit ../refman-5.1 ../refman-common
-IDMAP_SRCS = $(wildcard *.xml)
+IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
 IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables


Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook	2007-05-15 16:11:05 UTC (rev 6465)
+++ trunk/make.d/vars-docbook	2007-05-15 16:27:10 UTC (rev 6466)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 526 bytes

@@ -430,3 +430,8 @@
 
 xmllist_to_idmaplist = \
   $(foreach path, $(filter %.xml, $(1)), $(call xml_to_idmap, $(path)))
+
+# Given a list of .xml files, return the "base" files, that is, those
+# that are not built as targets.
+
+base_xml_files = $(patsubst %prepped.xml,,$(patsubst %-nolink.xml,,$(1)))


Modified: trunk/mysqlqb/Makefile
===================================================================
--- trunk/mysqlqb/Makefile	2007-05-15 16:11:05 UTC (rev 6465)
+++ trunk/mysqlqb/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 538 bytes

@@ -34,7 +34,7 @@
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-common ../refman-5.0
-IDMAP_SRCS = $(mysqlqb_IDMAP_SOURCES) $(wildcard ../refman-common/*.xml)
+IDMAP_SRCS = $(mysqlqb_IDMAP_SOURCES)
 IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables


Modified: trunk/refman-common/Makefile
===================================================================
--- trunk/refman-common/Makefile	2007-05-15 16:11:05 UTC (rev 6465)
+++ trunk/refman-common/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 543 bytes

@@ -19,7 +19,7 @@
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-4.1 ../refman-5.0 ../refman-5.1/
-IDMAP_SRCS = $(wildcard *.xml)
+IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
 IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables