Author: paul
Date: 2009-05-31 02:25:31 +0200 (Sun, 31 May 2009)
New Revision: 15144
Log:
r38710@arctic: paul | 2009-05-30 19:24:46 -0500
Update dependencies
Modified:
trunk/mysqltest/Makefile
trunk/mysqltest/Makefile.depends
trunk/workbench/Makefile
trunk/workbench/Makefile.depends
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41711
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38669
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:41711
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:38710
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2009-05-30 23:15:34 UTC (rev 15143)
+++ trunk/mysqltest/Makefile 2009-05-31 00:25:31 UTC (rev 15144)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 478 bytes
@@ -20,7 +20,7 @@
IDMAP_MAIN = mysqltest
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-5.1
+IDMAP_REFS = $(REPO_ROOT)/mysqltest $(REPO_ROOT)/refman-5.1
IDMAP_SRCS = $(call base_xml_files)
# Import standard variables
Modified: trunk/mysqltest/Makefile.depends
===================================================================
--- trunk/mysqltest/Makefile.depends 2009-05-30 23:15:34 UTC (rev 15143)
+++ trunk/mysqltest/Makefile.depends 2009-05-31 00:25:31 UTC (rev 15144)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 2; 1380 bytes
@@ -4,6 +4,7 @@
command_reference_IMAGES =
command_reference_SOURCES = command-reference.xml $(command_reference_INCLUDES)
command_reference_IDMAPS = \
+ metadata/command-reference.idmap \
metadata/writing-tests.idmap
command-reference.validpure: $(command_reference_SOURCES)
command-reference.titles: $(command_reference_SOURCES)
@@ -73,7 +74,10 @@
mysqltest_IMAGES =
mysqltest_SOURCES = mysqltest.xml $(mysqltest_INCLUDES)
mysqltest_IDMAPS = \
- ../refman-5.1/metadata/installing-core.idmap
+ ../refman-5.1/metadata/installing-core.idmap \
+ metadata/command-reference.idmap \
+ metadata/programs.idmap \
+ metadata/writing-tests.idmap
mysqltest.validpure: $(mysqltest_SOURCES)
mysqltest.titles: $(mysqltest_SOURCES)
mysqltest.useless: $(mysqltest_SOURCES)
@@ -154,7 +158,8 @@
writing_tests_SOURCES = writing-tests.xml $(writing_tests_INCLUDES)
writing_tests_IDMAPS = \
metadata/command-reference.idmap \
- metadata/programs.idmap
+ metadata/programs.idmap \
+ metadata/writing-tests.idmap
writing-tests.validpure: $(writing_tests_SOURCES)
writing-tests.titles: $(writing_tests_SOURCES)
writing-tests.useless: $(writing_tests_SOURCES)
Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile 2009-05-30 23:15:34 UTC (rev 15143)
+++ trunk/workbench/Makefile 2009-05-31 00:25:31 UTC (rev 15144)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 614 bytes
@@ -19,7 +19,7 @@
IDMAP_MAIN = workbench
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/gui-common $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-5.0
+IDMAP_REFS = $(REPO_ROOT)/workbench $(REPO_ROOT)/gui-common $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-5.0
IDMAP_SRCS = $(call base_xml_files)
Modified: trunk/workbench/Makefile.depends
===================================================================
--- trunk/workbench/Makefile.depends 2009-05-30 23:15:34 UTC (rev 15143)
+++ trunk/workbench/Makefile.depends 2009-05-31 00:25:31 UTC (rev 15144)
Changed blocks: 15, Lines Added: 43, Lines Deleted: 12; 6300 bytes
@@ -6,7 +6,8 @@
workbench.ent
dbdoc_templates_IMAGES =
dbdoc_templates_SOURCES = dbdoc-templates.xml $(dbdoc_templates_INCLUDES)
-dbdoc_templates_IDMAPS =
+dbdoc_templates_IDMAPS = \
+ metadata/dbdoc-templates.idmap
dbdoc-templates.validpure: $(dbdoc_templates_SOURCES)
dbdoc-templates.titles: $(dbdoc_templates_SOURCES)
dbdoc-templates.useless: $(dbdoc_templates_SOURCES)
@@ -26,7 +27,8 @@
documenting_database_IMAGES = \
images/published/wb-sakila-eer.png
documenting_database_SOURCES = documenting-database.xml $(documenting_database_INCLUDES)
-documenting_database_IDMAPS =
+documenting_database_IDMAPS = \
+ metadata/documenting-database.idmap
documenting-database.validpure: $(documenting_database_SOURCES)
documenting-database.titles: $(documenting_database_SOURCES)
documenting-database.useless: $(documenting_database_SOURCES)
@@ -108,6 +110,7 @@
foreign_key_relationships_SOURCES = foreign-key-relationships.xml $(foreign_key_relationships_INCLUDES)
foreign_key_relationships_IDMAPS = \
../refman-5.1/metadata/introduction.idmap \
+ metadata/foreign-key-relationships.idmap \
metadata/reference.idmap \
metadata/tables.idmap
foreign-key-relationships.validpure: $(foreign_key_relationships_SOURCES)
@@ -130,6 +133,7 @@
images/published/wb-diff-sources.png
forward_engineering_SOURCES = forward-engineering.xml $(forward_engineering_INCLUDES)
forward_engineering_IDMAPS = \
+ metadata/forward-engineering.idmap \
metadata/reverse-engineering.idmap \
metadata/server-connection-wizard.idmap \
metadata/tables.idmap
@@ -183,12 +187,12 @@
installing_INCLUDES = \
../common/fixedchars.ent \
../refman-common/urls.ent \
- ../workbench/images/published/wb-installing-mac-install-screen.png \
+ images/published/wb-installing-mac-install-screen.png \
all-entities.ent \
version.ent \
workbench.ent
installing_IMAGES = \
- ../workbench/images/published/wb-installing-mac-install-screen.png
+ images/published/wb-installing-mac-install-screen.png
installing_SOURCES = installing.xml $(installing_INCLUDES)
installing_IDMAPS =
installing.validpure: $(installing_SOURCES)
@@ -291,7 +295,8 @@
workbench.ent
notes_IMAGES =
notes_SOURCES = notes.xml $(notes_INCLUDES)
-notes_IDMAPS =
+notes_IDMAPS = \
+ metadata/notes.idmap
notes.validpure: $(notes_SOURCES)
notes.titles: $(notes_SOURCES)
notes.useless: $(notes_SOURCES)
@@ -381,6 +386,7 @@
metadata/layers.idmap \
metadata/plugins.idmap \
metadata/printing.idmap \
+ metadata/reference.idmap \
metadata/reverse-engineering.idmap \
metadata/stored-procedures.idmap \
metadata/tables.idmap \
@@ -436,7 +442,8 @@
images/published/wb-connection-wizard1.png \
images/published/wb-connection-wizard2.png
server_connection_wizard_SOURCES = server-connection-wizard.xml $(server_connection_wizard_INCLUDES)
-server_connection_wizard_IDMAPS =
+server_connection_wizard_IDMAPS = \
+ metadata/server-connection-wizard.idmap
server-connection-wizard.validpure: $(server_connection_wizard_SOURCES)
server-connection-wizard.titles: $(server_connection_wizard_SOURCES)
server-connection-wizard.useless: $(server_connection_wizard_SOURCES)
@@ -456,6 +463,7 @@
stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
stored_procedures_IDMAPS = \
metadata/reference.idmap \
+ metadata/stored-procedures.idmap \
metadata/tables.idmap
stored-procedures.validpure: $(stored_procedures_SOURCES)
stored-procedures.titles: $(stored_procedures_SOURCES)
@@ -487,7 +495,8 @@
../refman-5.1/metadata/se-merge.idmap \
../refman-5.1/metadata/se-myisam-core.idmap \
../refman-5.1/metadata/sql-syntax-data-definition.idmap \
- metadata/reference.idmap
+ metadata/reference.idmap \
+ metadata/tables.idmap
tables.validpure: $(tables_SOURCES)
tables.titles: $(tables_SOURCES)
tables.useless: $(tables_SOURCES)
@@ -532,7 +541,8 @@
tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
tutorial_IDMAPS = \
metadata/documenting-database.idmap \
- metadata/reverse-engineering.idmap
+ metadata/reverse-engineering.idmap \
+ metadata/tutorial.idmap
tutorial.validpure: $(tutorial_SOURCES)
tutorial.titles: $(tutorial_SOURCES)
tutorial.useless: $(tutorial_SOURCES)
@@ -570,7 +580,8 @@
views_SOURCES = views.xml $(views_INCLUDES)
views_IDMAPS = \
metadata/reference.idmap \
- metadata/tables.idmap
+ metadata/tables.idmap \
+ metadata/views.idmap
views.validpure: $(views_SOURCES)
views.titles: $(views_SOURCES)
views.useless: $(views_SOURCES)
@@ -585,7 +596,7 @@
../dynamic-docs/changelog/workbench-versions.xml \
../dynamic-docs/changelog/workbench.xml \
../refman-common/urls.ent \
- ../workbench/images/published/wb-installing-mac-install-screen.png \
+ images/published/wb-installing-mac-install-screen.png \
all-entities.ent \
dbdoc-templates.xml \
documenting-database.xml \
@@ -647,7 +658,7 @@
views.xml \
workbench.ent
workbench_IMAGES = \
- ../workbench/images/published/wb-installing-mac-install-screen.png \
+ images/published/wb-installing-mac-install-screen.png \
images/published/wb-add-eer-diagram.png \
images/published/wb-application-layout.png \
images/published/wb-connection-wizard1.png \
@@ -684,7 +695,27 @@
../refman-5.1/metadata/partitioning.idmap \
../refman-5.1/metadata/se-merge.idmap \
../refman-5.1/metadata/se-myisam-core.idmap \
- ../refman-5.1/metadata/sql-syntax-data-definition.idmap
+ ../refman-5.1/metadata/sql-syntax-data-definition.idmap \
+ metadata/dbdoc-templates.idmap \
+ metadata/documenting-database.idmap \
+ metadata/foreign-key-relationships.idmap \
+ metadata/forward-engineering.idmap \
+ metadata/grt-shell.idmap \
+ metadata/images.idmap \
+ metadata/launching.idmap \
+ metadata/layers.idmap \
+ metadata/notes.idmap \
+ metadata/plugins.idmap \
+ metadata/printing.idmap \
+ metadata/reference.idmap \
+ metadata/reverse-engineering.idmap \
+ metadata/server-connection-wizard.idmap \
+ metadata/stored-procedures.idmap \
+ metadata/tables.idmap \
+ metadata/text-objects.idmap \
+ metadata/tutorial.idmap \
+ metadata/validation-plugins.idmap \
+ metadata/views.idmap
workbench.validpure: $(workbench_SOURCES)
workbench.titles: $(workbench_SOURCES)
workbench.useless: $(workbench_SOURCES)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r15144 - in trunk: . mysqltest workbench | paul.dubois | 31 May |
