Author: paul
Date: 2006-07-20 03:47:28 +0200 (Thu, 20 Jul 2006)
New Revision: 2780
Log:
r12494@frost: paul | 2006-07-19 20:43:01 -0500
Have "make depend" also compute from the list of dependencies the list
of image files. Then use that to set the IMAGE_FILES variable that is
used by target rules that generate HTML output into a new directory so
that they know which images to copy into that directory.
Modified:
trunk/administrator/Makefile
trunk/internals/Makefile
trunk/make.d/xml-depend
trunk/migration-toolkit/Makefile
trunk/mysqltest/Makefile
trunk/ndbapi/Makefile
trunk/proto-doc/Makefile
trunk/proto-doc/README
trunk/query-browser/Makefile
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
trunk/userguide/Makefile
trunk/workbench/Makefile
trunk/xsl.d/xmldepend.xsl
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11614
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12366
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11614
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12494
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/administrator/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 2284 bytes
@@ -29,9 +29,11 @@
ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml legalnotice.en.xml copyright.xml images/connection.png images/configure-service-mode-connection.png images/configure-service-mode-window.png images/mainwindow.png images/marked-area.png images/user-accounts.png images/user-information.png images/graph-settings.png images/server-logs-general-log.png images/restore-content.png images/replication.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-administrator.xml images/system-tray.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-trou!
bleshooting.xml ../gui-common/images/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml
+ADMINISTRATOR_IMAGES = images/connection.png images/configure-service-mode-connection.png images/configure-service-mode-window.png images/mainwindow.png images/marked-area.png images/user-accounts.png images/user-information.png images/graph-settings.png images/server-logs-general-log.png images/restore-content.png images/replication.png ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/options.png ../gui-common/images/options-connection.png images/system-tray.png ../gui-common/images/connectionerror.png
+
administrator-prepped.xml: $(ADMINISTRATOR_SRCS)
-IMAGE_FILES = ../gui-common/images/*.png images/*.png
+IMAGE_FILES = $(ADMINISTRATOR_IMAGES)
# Import standard target rules
Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/internals/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 464 bytes
@@ -29,8 +29,12 @@
INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.en.xml copyright.xml
+INTERNALS_IMAGES =
+
internals-prepped.xml: $(INTERNALS_SRCS)
+IMAGE_FILES = $(INTERNALS_IMAGES)
+
clean::
$(RM) internals.txt
Modified: trunk/make.d/xml-depend
===================================================================
--- trunk/make.d/xml-depend 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/make.d/xml-depend 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 2, Lines Added: 34, Lines Deleted: 16; 3556 bytes
@@ -1,25 +1,39 @@
-# General target for updating the Makefile with the dependencies for
-# an XML document. For a document named abc-def.xml, it adds a line
-# that defines a variable ABC_DEF_SRCS where the variable value includes
-# abc-def.xml and any documents referred to by abc-def.xml.
+# General target for updating the Makefile with full and image-only
+# dependencies for an XML document. For a document named abc-def.xml,
+# it adds lines that define two variables, ABC_DEF_SRCS and ABC_DEF_IMAGES:
+# - The first names all dependencies. Its value includes abc-def.xml
+# and any files referred to by abc-def.xml.
+# - The second names only the image files referred to by abc-def.xml
+# (this is based on the assumption that anything not referred to via
+# xinclude is an image.
# The rule works like this:
# - Make a backup of the Makefile. (If you kill the "make depend"
# command while it's processing the Makefile, you can recover it
# from Makefile.bak.)
-# - Determine the dependency variable name to hold the document
-# dependencies:
-# - Convert to uppercase, and convert hyphens to underscores
-# - Add _SRCS to the end
-# - Compute the list of files referred to by the XML document.
+# - Determine the basename of the dependency variable names by
+# converting to uppercase and converting hyphens to underscores
+# - Add _SRCS or _IMAGES to the end to complete the variable names.
+# - Compute the list of files referred to by the XML document, and
+# the list of images referred to by the XML document.
# Note: xsltproc should be run without the --xinclude option.
-# - Update the Makefile line that defines the dependency variable.
-# BEFORE RUNNING "make depend" the first time, you should put a
-# line in the Makefile that defines the dependency variable (the value
-# can be anything, even empty):
-# XXX_SRCS =
+# - Delete from the Makefile any existing lines that define the
+# dependency variables. Write the result to Makefile.new.
+# - Add lines to Makefile.new with the new values of the dependency
+# variables.
# - Rename Makefile.new to Makefile.
+# IMPORTANT:
+# BEFORE RUNNING "make depend" the first time, you should put a line
+# in the Makefile that defines the _SRCS dependency variable (the value
+# can be anything, even empty):
+# XXX_SRCS =
+# If you do not include this variable line, it cannot be updated.
+# If you also need to use the _IMAGES variable, include a line for
+# it, too:
+# XXX_IMAGES =
+
+
# If there are dependency files that xmldepend.xsl does not detect
# (such as entity files that are processed by the XML parser and
# do not appear at the XSL level), you can define XXX_SRCS_EXTRA
@@ -27,11 +41,15 @@
%.depend: %.xml
cp Makefile Makefile.bak
- VAR=`echo $* | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`_SRCS && \
+ VAR=`echo $* | tr a-z- A-Z_` && \
DEPS=`xsltproc --novalid \
--stringparam xmldepend.terminator " " \
$(XMLDEPEND_XSL) $<` && \
- sed -e "s|^$$VAR *=.*|$$VAR = "'$$'"($${VAR}_EXTRA) $< $$DEPS|" Makefile > Makefile.new
+ IMAGE_DEPS=`echo $$DEPS|sed -e 's/ *[^ ]*\.xml//g' -e 's/ *[^ ]*\.txt//g'` && \
+ sed \
+ -e "s|^$${VAR}_SRCS *=.*|$${VAR}_SRCS = "'$$'"($${VAR}_SRCS_EXTRA) $< $$DEPS|" \
+ -e "s|^$${VAR}_IMAGES *=.*|$${VAR}_IMAGES = $$IMAGE_DEPS|" \
+ Makefile > Makefile.new
mv Makefile.new Makefile
clean::
Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/migration-toolkit/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 2209 bytes
@@ -27,9 +27,11 @@
MIGRATION_TOOLKIT_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.xml legalnotice.en.xml copyright.xml images/migration-plan.png images/welcome-screen.png images/configuration-type.png images/source-database-access.png images/source-database-mssql.png images/source-database-oracle.png images/source-database-oracle-nodriver.png images/source-database-mysql.png images/target-database-mysql.png images/connect-servers.png images/schema-selection.png images/reverse-engineering.png images/object-selection.png images/object-selection-detail.png images/object-selection-expression.png images/object-mapping.png images/meta-migration.png images/manual-editing.png images/manual-editing-detail.png images/creation-options.png images/creating-objects.png images/mapping-options.png images/bulk-transfer.png images/summary.png images/access-options-show.png images/access-system-tables.png images/access-object-permissions.png
+MIGRATION_TOOLKIT_IMAGES = images/migration-plan.png images/welcome-screen.png images/configuration-type.png images/source-database-access.png images/source-database-mssql.png images/source-database-oracle.png images/source-database-oracle-nodriver.png images/source-database-mysql.png images/target-database-mysql.png images/connect-servers.png images/schema-selection.png images/reverse-engineering.png images/object-selection.png images/object-selection-detail.png images/object-selection-expression.png images/object-mapping.png images/meta-migration.png images/manual-editing.png images/manual-editing-detail.png images/creation-options.png images/creating-objects.png images/mapping-options.png images/bulk-transfer.png images/summary.png images/access-options-show.png images/access-system-tables.png images/access-object-permissions.png
+
migration-toolkit-prepped.xml: $(MIGRATION_TOOLKIT_SRCS)
-IMAGE_FILES = images/*.png
+IMAGE_FILES = $(MIGRATION_TOOLKIT_IMAGES)
# Import standard target rules
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/mysqltest/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 555 bytes
@@ -29,8 +29,12 @@
MYSQLTEST_SRCS = $(MYSQLTEST_SRCS_EXTRA) mysqltest.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml components.xml tutorial.xml programs.xml command-reference.xml
+MYSQLTEST_IMAGES =
+
mysqltest-prepped.xml: $(MYSQLTEST_SRCS)
+IMAGE_FILES = $(MYSQLTEST_IMAGES)
+
clean::
$(RM) mysqltest.txt
Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/ndbapi/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 2434 bytes
@@ -29,9 +29,11 @@
NDBAPI_SRCS = $(NDBAPI_SRCS_EXTRA) ndbapi.xml legalnotice.en.xml copyright.xml overview.xml getting-started.xml ndb-classes.xml images/Ndb-class.png images/Ndb-cluster-connection-class.png images/NdbBlob-class.png images/NdbDictionary-classes.png images/NdbDictionary-Dictionary-class.png images/NdbDictionary-Column-class.png images/NdbDictionary-Object-class.png images/NdbDictionary-Object-Datafile-class.png images/NdbDictionary-Object-Event-class.png images/NdbDictionary-Object-Index-class.png images/NdbDictionary-Object-LogfileGroup-class.png images/NdbDictionary-Object-Table-class.png images/NdbDictionary-Object-Tablespace-class.png images/NdbDictionary-Object-Undofile-class.png images/NdbDictionary-AutoGrowSpecification-struct.png images/NdbEventOperation-class.png images/NdbOperation-subclasses.png images/NdbOperation-class.png images/NdbIndexOperation-class.png images/NdbScanOperation-class.png images/NdbIndexScanOperation-class.png images/NdbRecAttr-class.png images/!
NdbScanFilter-class.png images/NdbTransaction-class.png errors.xml images/NdbError-struct.png mgm-api.xml examples.xml
+NDBAPI_IMAGES = images/Ndb-class.png images/Ndb-cluster-connection-class.png images/NdbBlob-class.png images/NdbDictionary-classes.png images/NdbDictionary-Dictionary-class.png images/NdbDictionary-Column-class.png images/NdbDictionary-Object-class.png images/NdbDictionary-Object-Datafile-class.png images/NdbDictionary-Object-Event-class.png images/NdbDictionary-Object-Index-class.png images/NdbDictionary-Object-LogfileGroup-class.png images/NdbDictionary-Object-Table-class.png images/NdbDictionary-Object-Tablespace-class.png images/NdbDictionary-Object-Undofile-class.png images/NdbDictionary-AutoGrowSpecification-struct.png images/NdbEventOperation-class.png images/NdbOperation-subclasses.png images/NdbOperation-class.png images/NdbIndexOperation-class.png images/NdbScanOperation-class.png images/NdbIndexScanOperation-class.png images/NdbRecAttr-class.png images/NdbScanFilter-class.png images/NdbTransaction-class.png images/NdbError-struct.png
+
ndbapi-prepped.xml: $(NDBAPI_SRCS)
-IMAGE_FILES = images/*.png
+IMAGE_FILES = $(NDBAPI_IMAGES)
# Import standard target rules
Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/proto-doc/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 610 bytes
@@ -29,12 +29,12 @@
PROTO_DOC_SRCS = $(PROTO_DOC_SRCS_EXTRA) proto-doc.xml legalnotice.en.xml copyright.xml
+PROTO_DOC_IMAGES =
+
proto-doc-prepped.xml: $(PROTO_DOC_SRCS)
-# If the document refers to image files, set this variable to name them all
+IMAGE_FILES = ($PROTO_DOC_IMAGES)
-IMAGE_FILES =
-
# Include this target if you generate plain text format
clean::
$(RM) proto-doc.txt
Modified: trunk/proto-doc/README
===================================================================
--- trunk/proto-doc/README 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/proto-doc/README 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 962 bytes
@@ -4,7 +4,7 @@
1) Make a copy of this directory, named for the new document. In
the following instructions, suppose that this copy is named "my-doc".
-2) Rename proto-doc.xml to the name you'll use for your document
+2) Rename proto-doc.xml to the name that you'll use for your document
Example: mv proto-doc.xml my-doc.xml
@@ -12,7 +12,7 @@
the title to something meaningful.
4) Edit Makefile to change "proto-doc" and "PROTO_DOC" to "my-doc"
- and "MY_DOC". Also note other comments and make any appropriate
- changes.
+ and "MY_DOC". Also note other comments in the Makefile and make
+ any appropriate changes.
-5) Update copyright.xml for the actual copyright date.
+5) Update copyright.xml with the actual copyright date.
Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/query-browser/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 2248 bytes
@@ -29,9 +29,11 @@
QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml legalnotice.en.xml copyright.xml images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/file-open-script.png images/tabletool.png images/blob-buttons.png images/dynamiclist.png images/stored-procedure-database-browser.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-query-browser.xml images/qb-options.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-troubleshooting.xml ..!
/gui-common/images/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml
+QUERY_BROWSER_IMAGES = images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/file-open-script.png images/tabletool.png images/blob-buttons.png images/dynamiclist.png images/stored-procedure-database-browser.png ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/options.png ../gui-common/images/options-connection.png images/qb-options.png ../gui-common/images/connectionerror.png
+
query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)
-IMAGE_FILES = ../gui-common/images/*.png images/*.png
+IMAGE_FILES = $(QUERY_BROWSER_IMAGES)
# Import standard target rules
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/refman-4.1/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 2; 11090 bytes
@@ -27,8 +27,10 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-in!
stall-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myacce!
ss.png images/myaccess-odbc.png connector-net.xml ../refman-co!
mmon/new
s-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-in!
stall-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myacce!
ss.png images/myaccess-odbc.png connector-net.xml images/cnet-!
win-inst
all-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml ../refman-common/news-connector-net.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_IMAGES = images/blackhole-1.png images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodb!
c-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
@@ -40,29 +42,41 @@
depend:: connector-j.depend
CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml
+CONNECTOR_J_IMAGES =
+
connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
depend:: connector-mxj.depend
CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml
+CONNECTOR_MXJ_IMAGES =
+
connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
depend:: connector-net.depend
CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml ../refman-common/news-connector-net.xml
+CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
+CONNECTOR_NET_IMAGES = images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
depend:: connector-odbc.depend
CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
+CONNECTOR_ODBC_IMAGES = images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png ima!
ges/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
+
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/refman-5.0/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 2; 11064 bytes
@@ -27,8 +27,10 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml!
connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-st!
ep3.png images/myodbc-excel-step4.png images/myodbc-excel-step!
5.png im
ages/myaccess.png images/myaccess-odbc.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml!
connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-st!
ep3.png images/myodbc-excel-step4.png images/myodbc-excel-step!
5.png im
ages/myaccess.png images/myaccess-odbc.png connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml ../refman-common/news-connector-net.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_IMAGES = images/blackhole-1.png images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodb!
c-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
@@ -40,29 +42,41 @@
depend:: connector-j.depend
CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml
+CONNECTOR_J_IMAGES =
+
connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
depend:: connector-mxj.depend
CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml
+CONNECTOR_MXJ_IMAGES =
+
connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
depend:: connector-net.depend
CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml ../refman-common/news-connector-net.xml
+CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
+CONNECTOR_NET_IMAGES = images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
depend:: connector-odbc.depend
CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
+CONNECTOR_ODBC_IMAGES = images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png ima!
ges/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
+
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/refman-5.1/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 2; 11609 bytes
@@ -27,8 +27,10 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images!
/cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.!
png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc!
-win-tra
cing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images!
/cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.!
png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc!
-win-tra
cing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml ../refman-common/news-connector-net.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_IMAGES = images/pluggable-storage-overview.png images/blackhole-1.png images/custom-engine-overview.png images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.png images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odb!
cadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
@@ -40,29 +42,41 @@
depend:: connector-j.depend
CONNECTOR_J_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml
+CONNECTOR_J_IMAGES =
+
connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
depend:: connector-mxj.depend
CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml
+CONNECTOR_MXJ_IMAGES =
+
connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
depend:: connector-net.depend
CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml ../refman-common/news-connector-net.xml
+CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
+CONNECTOR_NET_IMAGES = images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
+
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
depend:: connector-odbc.depend
CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
+
CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
+CONNECTOR_ODBC_IMAGES = images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png ima!
ges/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
+
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/userguide/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 1152 bytes
@@ -25,10 +25,15 @@
# Dependency list for MySQL User Guide document
# This variable is updated by "make depend"
+USERGUIDE_SRCS_EXTRA =
+
USERGUIDE_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.xml legalnotice.en.xml copyright.xml introduction.xml creating.xml populating.xml querying.xml modifying.xml indexing.xml images/indexing-displaying-administrator.png storage-engines.xml views.xml stored-procedures.xml installing.xml configuring.xml security.xml logfiles.xml images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png disaster.xml php-mysqli.xml dotnet.xml java.xml glossary.xml
+USERGUIDE_IMAGES = images/indexing-displaying-administrator.png images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png
+
userguide-prepped.xml: $(USERGUIDE_SRCS)
+IMAGE_FILES = $(USERGUIDE_IMAGES)
# Import standard target rules
Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/workbench/Makefile 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 652 bytes
@@ -29,9 +29,11 @@
WORKBENCH_SRCS = $(WORKBENCH_SRCS_EXTRA) workbench.xml legalnotice.en.xml copyright.xml images/workbench-windows.png images/workbench-osx.png images/workbench-linux.png
+WORKBENCH_IMAGES = images/workbench-windows.png images/workbench-osx.png images/workbench-linux.png
+
workbench-prepped.xml: $(WORKBENCH_SRCS)
-IMAGE_FILES = images/*.png
+IMAGE_FILES = $(WORKBENCH_IMAGES)
clean::
$(RM) workbench.txt
Modified: trunk/xsl.d/xmldepend.xsl
===================================================================
--- trunk/xsl.d/xmldepend.xsl 2006-07-19 21:47:34 UTC (rev 2779)
+++ trunk/xsl.d/xmldepend.xsl 2006-07-20 01:47:28 UTC (rev 2780)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 11; 1888 bytes
@@ -19,8 +19,10 @@
2005-08-16
Change history:
-2005-08-16
-- Version 1.00.
+2005-08-16 (Version 1.00)
+- Initial implementation.
+2006-07-19 (Version 1.00)
+- Add xmldepend.emit.xincludes, xmldepend.emit.filerefs parameters.
TODO:
- add params for whether to produce debugging output, etc.
@@ -31,6 +33,8 @@
<!-- BEGIN PARAMETERS -->
<xsl:param name="xmldepend.terminator" select="'
'"/>
+<xsl:param name="xmldepend.emit.xincludes" select="1"/>
+<xsl:param name="xmldepend.emit.filerefs" select="1"/>
<!-- END PARAMETERS -->
@@ -105,11 +109,13 @@
is an absolute pathname.
-->
- <xsl:if test="not(starts-with(@href,'/'))">
- <xsl:value-of select="$curdir"/>
+ <xsl:if test="$xmldepend.emit.xincludes">
+ <xsl:if test="not(starts-with(@href,'/'))">
+ <xsl:value-of select="$curdir"/>
+ </xsl:if>
+ <xsl:value-of select="@href"/>
+ <xsl:value-of select="$xmldepend.terminator"/>
</xsl:if>
- <xsl:value-of select="@href"/>
- <xsl:value-of select="$xmldepend.terminator"/>
<!--
Process included file (unless parse="text").
@@ -141,11 +147,13 @@
<xsl:template match="*[@fileref]">
<xsl:param name="curdir"/>
- <xsl:if test="not(starts-with(@fileref,'/'))">
- <xsl:value-of select="$curdir"/>
- </xsl:if>
- <xsl:value-of select="@fileref"/>
- <xsl:value-of select="$xmldepend.terminator"/>
+ <xsl:if test="$xmldepend.emit.filerefs">
+ <xsl:if test="not(starts-with(@fileref,'/'))">
+ <xsl:value-of select="$curdir"/>
+ </xsl:if>
+ <xsl:value-of select="@fileref"/>
+ <xsl:value-of select="$xmldepend.terminator"/>
+ </xsl:if>
</xsl:template>
<!-- Identity transform, but keep track of current document directory -->
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2780 - in trunk: . administrator internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browser refman-4.... | paul | 20 Jul |
