List:Internals« Previous MessageNext Message »
From:paul Date:May 29 2005 5:57am
Subject:bk commit - mysqldoc@docsrva tree (paul:1.2722)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2722 05/05/28 22:57:05 paul@stripped +30 -0
  Move migration-toolkit doc to own directory.
  Modularize html-help, chm target rules.

  migration-toolkit/Makefile
    1.1 05/05/28 22:57:02 paul@stripped +104 -0

  migration-toolkit/migration-toolkit.xml
    1.7 05/05/28 22:57:02 paul@stripped +26 -26
    Remap image paths.

  migration-toolkit/Makefile
    1.0 05/05/28 22:57:02 paul@stripped +0 -0
    BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/migration-toolkit/Makefile

  make.d/xml-html-help
    1.2 05/05/28 22:57:02 paul@stripped +17 -0
    Modularize Makefile rules for html-help, chm targets.

  internals/Makefile
    1.3 05/05/28 22:57:02 paul@stripped +19 -20
    Reorganize Makefile

  make.d/xml-html-help
    1.1 05/05/28 22:31:45 paul@stripped +25 -0

  make.d/xml-html-help
    1.0 05/05/28 22:31:45 paul@stripped +0 -0
    BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/make.d/xml-html-help

  migration-toolkit/images/welcome-screen.png
    1.3 05/05/28 22:20:54 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/welcome-screen.png ->
migration-toolkit/images/welcome-screen.png

  migration-toolkit/images/target-database-mysql.png
    1.3 05/05/28 22:20:54 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/target-database-mysql.png ->
migration-toolkit/images/target-database-mysql.png

  migration-toolkit/images/summary.png
    1.3 05/05/28 22:20:54 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/summary.png -> migration-toolkit/images/summary.png

  migration-toolkit/images/source-database-oracle.png
    1.3 05/05/28 22:20:54 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/source-database-oracle.png ->
migration-toolkit/images/source-database-oracle.png

  migration-toolkit/images/source-database-oracle-nodriver.png
    1.3 05/05/28 22:20:53 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/source-database-oracle-nodriver.png ->
migration-toolkit/images/source-database-oracle-nodriver.png

  migration-toolkit/images/source-database-mysql.png
    1.3 05/05/28 22:20:53 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/source-database-mysql.png ->
migration-toolkit/images/source-database-mysql.png

  migration-toolkit/images/source-database-access.png
    1.3 05/05/28 22:20:53 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/source-database-access.png ->
migration-toolkit/images/source-database-access.png

  migration-toolkit/images/schema-selection.png
    1.3 05/05/28 22:20:53 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/schema-selection.png ->
migration-toolkit/images/schema-selection.png

  migration-toolkit/images/reverse-engineering.png
    1.3 05/05/28 22:20:53 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/reverse-engineering.png ->
migration-toolkit/images/reverse-engineering.png

  migration-toolkit/images/object-selection.png
    1.3 05/05/28 22:20:52 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/object-selection.png ->
migration-toolkit/images/object-selection.png

  migration-toolkit/images/object-selection-expression.png
    1.3 05/05/28 22:20:52 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/object-selection-expression.png ->
migration-toolkit/images/object-selection-expression.png

  migration-toolkit/images/object-selection-detail.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/object-selection-detail.png ->
migration-toolkit/images/object-selection-detail.png

  migration-toolkit/images/object-mapping.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/object-mapping.png ->
migration-toolkit/images/object-mapping.png

  migration-toolkit/images/migration-plan.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/migration-plan.png ->
migration-toolkit/images/migration-plan.png

  migration-toolkit/images/meta-migration.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/meta-migration.png ->
migration-toolkit/images/meta-migration.png

  migration-toolkit/images/mapping-options.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/mapping-options.png ->
migration-toolkit/images/mapping-options.png

  migration-toolkit/images/manual-editing.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/manual-editing.png ->
migration-toolkit/images/manual-editing.png

  migration-toolkit/images/manual-editing-detail.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/manual-editing-detail.png ->
migration-toolkit/images/manual-editing-detail.png

  migration-toolkit/images/creation-options.png
    1.3 05/05/28 22:20:51 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/creation-options.png ->
migration-toolkit/images/creation-options.png

  migration-toolkit/images/creating-objects.png
    1.3 05/05/28 22:20:50 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/creating-objects.png ->
migration-toolkit/images/creating-objects.png

  migration-toolkit/images/connect-servers.png
    1.3 05/05/28 22:20:50 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/connect-servers.png ->
migration-toolkit/images/connect-servers.png

  migration-toolkit/images/configuration-type.png
    1.3 05/05/28 22:20:50 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/configuration-type.png ->
migration-toolkit/images/configuration-type.png

  migration-toolkit/images/bulk-transfer.png
    1.3 05/05/28 22:20:50 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/bulk-transfer.png ->
migration-toolkit/images/bulk-transfer.png

  migration-toolkit/images/access-system-tables.png
    1.3 05/05/28 22:20:50 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/access-system-tables.png ->
migration-toolkit/images/access-system-tables.png

  migration-toolkit/images/access-options-show.png
    1.3 05/05/28 22:20:50 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/access-options-show.png ->
migration-toolkit/images/access-options-show.png

  migration-toolkit/images/access-object-permissions.png
    1.3 05/05/28 22:20:49 paul@stripped +0 -0
    Rename: Docs/migration-toolkit/access-object-permissions.png ->
migration-toolkit/images/access-object-permissions.png

  migration-toolkit/migration-toolkit.xml
    1.6 05/05/28 22:20:12 paul@stripped +0 -0
    Rename: Docs/migration-toolkit.xml -> migration-toolkit/migration-toolkit.xml

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.5/Docs/migration-toolkit.xml	2005-04-29 11:56:54 -05:00
+++ 1.7/migration-toolkit/migration-toolkit.xml	2005-05-28 22:57:02 -05:00
@@ -283,7 +283,7 @@
 
   <figure>
    <title>The &migration_toolkit; Migration Plan</title>
-   <graphic fileref="migration-toolkit/migration-plan.png" lang="en" format="PNG"/>
+   <graphic fileref="images/migration-plan.png" lang="en" format="PNG"/>
   </figure>
 
   <itemizedlist>
@@ -372,7 +372,7 @@
 
    <figure>
     <title>The &migration_toolkit; welcome screen</title>
-    <graphic fileref="migration-toolkit/welcome-screen.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/welcome-screen.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -401,7 +401,7 @@
 
    <figure>
     <title>The Configuration Type screen</title>
-    <graphic fileref="migration-toolkit/configuration-type.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/configuration-type.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -457,7 +457,7 @@
 
     <figure>
      <title>Source database - Microsoft Access</title>
-     <graphic fileref="migration-toolkit/source-database-access.png" lang="en"
format="PNG"/>
+     <graphic fileref="images/source-database-access.png" lang="en" format="PNG"/>
     </figure>
 
     <para>
@@ -489,7 +489,7 @@
 
     <figure>
      <title>Source database - Oracle</title>
-     <graphic fileref="migration-toolkit/source-database-oracle.png" lang="en"
format="PNG"/>
+     <graphic fileref="images/source-database-oracle.png" lang="en" format="PNG"/>
     </figure>
 
     <para>
@@ -500,7 +500,7 @@
 
     <figure>
      <title>Oracle JDBC driver not attached</title>
-     <graphic fileref="migration-toolkit/source-database-oracle-nodriver.png"
lang="en" format="PNG"/>
+     <graphic fileref="images/source-database-oracle-nodriver.png" lang="en"
format="PNG"/>
     </figure>
 
     <para>
@@ -537,7 +537,7 @@
 
     <figure>
      <title>Source database - MySQL</title>
-     <graphic fileref="migration-toolkit/source-database-mysql.png" lang="en"
format="PNG"/>
+     <graphic fileref="images/source-database-mysql.png" lang="en" format="PNG"/>
     </figure>
 
    </sect2>
@@ -592,7 +592,7 @@
 
    <figure>
     <title>Target Database - MySQL</title>
-    <graphic fileref="migration-toolkit/target-database-mysql.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/target-database-mysql.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -616,7 +616,7 @@
 
    <figure>
     <title>The Connect to Servers screen</title>
-    <graphic fileref="migration-toolkit/connect-servers.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/connect-servers.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -644,7 +644,7 @@
 
    <figure>
     <title>The Source Schema Selection screen</title>
-    <graphic fileref="migration-toolkit/schema-selection.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/schema-selection.png" lang="en" format="PNG"/>
    </figure>
 
   </sect1>
@@ -663,7 +663,7 @@
 
    <figure>
     <title>The Reverse Engineering screen</title>
-    <graphic fileref="migration-toolkit/reverse-engineering.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/reverse-engineering.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -692,7 +692,7 @@
 
    <figure>
     <title>The Object Type Selection screen</title>
-    <graphic fileref="migration-toolkit/object-selection.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/object-selection.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -712,7 +712,7 @@
 
     <figure>
      <title>The detail view of the Object Type Selection screen</title>
-     <graphic fileref="migration-toolkit/object-selection-detail.png" lang="en"
format="PNG"/>
+     <graphic fileref="images/object-selection-detail.png" lang="en" format="PNG"/>
     </figure>
 
     <para>
@@ -729,7 +729,7 @@
 
     <figure>
      <title>The Add Ignore Pattern dialog</title>
-     <graphic fileref="migration-toolkit/object-selection-expression.png" lang="en"
format="PNG"/>
+     <graphic fileref="images/object-selection-expression.png" lang="en"
format="PNG"/>
     </figure>
 
     <para>
@@ -769,7 +769,7 @@
 
    <figure>
     <title>The Object Mapping screen</title>
-    <graphic fileref="migration-toolkit/object-mapping.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/object-mapping.png" lang="en" format="PNG"/>
    </figure>
 
    <sect2 id="mysql-migration-toolkit-indepth-mapping-grt">
@@ -842,7 +842,7 @@
 
    <figure>
     <title>The Meta Migration screen</title>
-    <graphic fileref="migration-toolkit/meta-migration.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/meta-migration.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -872,7 +872,7 @@
 
    <figure>
     <title>The Manual Editing screen</title>
-    <graphic fileref="migration-toolkit/manual-editing.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/manual-editing.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -893,7 +893,7 @@
 
    <figure>
     <title>The Manual Editing screen - detailed view</title>
-    <graphic fileref="migration-toolkit/manual-editing-detail.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/manual-editing-detail.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -922,7 +922,7 @@
 
    <figure>
     <title>The Object Creation Options screen</title>
-    <graphic fileref="migration-toolkit/creation-options.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/creation-options.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -950,7 +950,7 @@
 
    <figure>
     <title>The Creating Objects screen</title>
-    <graphic fileref="migration-toolkit/creating-objects.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/creating-objects.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -976,7 +976,7 @@
 
    <figure>
     <title>The Data Mapping Options screen</title>
-    <graphic fileref="migration-toolkit/mapping-options.png" lang="en"
format="PNG"/>
+    <graphic fileref="images/mapping-options.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -1022,7 +1022,7 @@
 
    <figure>
     <title>The Bulk Data Transfer screen</title>
-    <graphic fileref="migration-toolkit/bulk-transfer.png" lang="en" format="PNG"/>
+    <graphic fileref="images/bulk-transfer.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -1045,7 +1045,7 @@
 
    <figure>
     <title>The Summary screen</title>
-    <graphic fileref="migration-toolkit/summary.png" lang="en" format="PNG"/>
+    <graphic fileref="images/summary.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -1109,7 +1109,7 @@
 
   <figure>
    <title>The show section</title>
-   <graphic fileref="migration-toolkit/access-options-show.png" lang="en"
format="PNG"/>
+   <graphic fileref="images/access-options-show.png" lang="en" format="PNG"/>
   </figure>
 
   <para>
@@ -1120,7 +1120,7 @@
 
   <figure>
    <title>The system objects</title>
-   <graphic fileref="migration-toolkit/access-system-tables.png" lang="en"
format="PNG"/>
+   <graphic fileref="images/access-system-tables.png" lang="en" format="PNG"/>
   </figure>
 
   <para>
@@ -1137,7 +1137,7 @@
 
   <figure>
    <title>Granting access to the system objects</title>
-   <graphic fileref="migration-toolkit/access-object-permissions.png" lang="en"
format="PNG"/>
+   <graphic fileref="images/access-object-permissions.png" lang="en" format="PNG"/>
   </figure>
 
   <para>

--- 1.2/internals/Makefile	2005-05-10 14:25:00 -05:00
+++ 1.3/internals/Makefile	2005-05-28 22:57:02 -05:00
@@ -19,6 +19,24 @@
 MAKE_DIR = $(REPO_ROOT)/make.d
 
 all::
+	@echo "You must say what you want to do."
+	@echo "Some commands supported by this Makefile:"
+	@echo "  make clean"
+	@echo "  make doc_name.html"
+	@echo "  make doc_name.pdf"
+	@echo "  make doc_name.txt"
+
+# Dependency list for internals document
+
+INTERNALS_SRCS = internals.xml
+
+internals-prepped.xml = $(INTERNALS_SRCS)
+
+#%.txt: %.html
+#	lynx -dump $< > $@
+
+clean::
+	$(RM) internals.txt
 
 # Import standard variables and target rules
 include $(MAKE_DIR)/vars-layout
@@ -32,29 +50,10 @@
 include $(MAKE_DIR)/xml-html-section
 include $(MAKE_DIR)/xml-html-chapter
 include $(MAKE_DIR)/xml-html-web
+include $(MAKE_DIR)/xml-html-help
 include $(MAKE_DIR)/xml-xhtml
 include $(MAKE_DIR)/xml-pdf
 include $(MAKE_DIR)/xml-txt
 include $(MAKE_DIR)/xml-texi
 include $(MAKE_DIR)/texi-info
 include $(MAKE_DIR)/xml-toc
-
-all::
-	@echo "You must say what you want to do."
-	@echo "Some commands supported by this Makefile:"
-	@echo "  make clean"
-	@echo "  make doc_name.html"
-	@echo "  make doc_name.pdf"
-	@echo "  make doc_name.txt"
-
-# Dependency list for internals document
-
-INTERNALS_SRCS = internals.xml
-
-internals-prepped.xml = $(INTERNALS_SRCS)
-
-#%.txt: %.html
-#	lynx -dump $< > $@
-
-clean::
-	$(RM) internals.txt
--- New file ---
+++ make.d/xml-html-help	05/05/28 22:31:45
# DocBook -> HTML Help -> CHM conversions

# Convert DocBook -> HTML Help, with one file per section.
# (Language sensitive)

# Use html-section driver file, but set chunk.section.depth to 0,
# causes chunking at the chapter level.
# (Language sensitive)

MYSQL_HTML_HELP_XSL = $(XSL_DIR)/mysql-html-help.xsl

%.html-help: %.html-help.d
	touch $@

.PRECIOUS: %.html-help.d

%.html-help.d: %-prepped.xml $(MYSQL_HTML_HELP_XSL)
	-$(RM) -r $@/
	mkdir $@/
	$(XSLTPROC) \
		--stringparam l10n.gentext.default.language `$(STEM_LANG_CODE) $*` \
		--output $@/ \
		$(MYSQL_HTML_HELP_XSL) \
		$<

clean::
	$(RM) -r *.html-help *.html-help.d


# HTML Help -> CHM conversion.  The .html-help.d directory must already be
# populated with all HTML files and any image and other files needed to
# build the .chm file.
# Note that the dependency is on the fake .html-help file, but the build-chm
# script is passed the .html-help.d directory name.

.PRECIOUS: %.html-help

%.chm: %.html-help
	$(TOOLS_DIR)/build-chm $<.d $@

clean::
	$(RM) *.chm

--- New file ---
+++ migration-toolkit/Makefile	05/05/28 22:57:02
# Makefile for MySQL Migration Toolkit Manual

# Formats we need for docsrva
# chm
# html-chapter
# html-section
# html-web
# pdf-a4
# pdf

# xhtml

# Location of repository root relative to current directory
REPO_ROOT = ..

# Location of directory containing Makefile components
MAKE_DIR = $(REPO_ROOT)/make.d

all::
	@echo "You must say what you want to do."
	@echo "Some commands supported by this Makefile:"
	@echo "  make clean"
	@echo "  make doc_name.html"
	@echo "  make doc_name.pdf"
	@echo "  make doc_name.txt"

# Dependency list for Migration Toolkit document

MIGRATION_TOOLKIT_SRCS = \
	migration-toolkit.xml \
	images/migration-plan.png \
	images/welcome-screen.png \
	images/configuration-type.png \
	images/source-database-access.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)

# Overrides for generic rules

migration-toolkit.html-section: migration-toolkit.html-section.d
	-$(RM) -r $</images
	mkdir $</images
	cp images/*.png $</images
	touch $@

migration-toolkit.html-chapter: migration-toolkit.html-chapter.d
	-$(RM) -r $</images
	mkdir $</images
	cp images/*.png $</images
	touch $@

migration-toolkit.html-web: migration-toolkit.html-web.d
	-$(RM) -r $</images
	mkdir $</images
	cp images/*.png $</images
	touch $@

migration-toolkit.html-help: migration-toolkit.html-help.d
	-$(RM) -r $</images
	mkdir $</images
	cp images/*.png $</images
	touch $@

# Import standard variables and target rules
include $(MAKE_DIR)/vars-layout
include $(MAKE_DIR)/vars-shell
include $(MAKE_DIR)/vars-docbook
include $(MAKE_DIR)/xml-valid
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
include $(MAKE_DIR)/xml-prep
#include $(MAKE_DIR)/xml-html
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
include $(MAKE_DIR)/xml-html-help
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
#include $(MAKE_DIR)/xml-txt
#include $(MAKE_DIR)/xml-texi
#include $(MAKE_DIR)/texi-info
include $(MAKE_DIR)/xml-toc

Thread
bk commit - mysqldoc@docsrva tree (paul:1.2722)paul29 May