List:Commits« Previous MessageNext Message »
From:paul Date:January 11 2007 6:09pm
Subject:svn commit - mysqldoc@docsrva: r4454 - in trunk: . mysqlqb
View as plain text  
Author: paul
Date: 2007-01-11 19:09:20 +0100 (Thu, 11 Jan 2007)
New Revision: 4454

Log:
 r17971@polar:  paul | 2007-01-11 12:02:35 -0600
 Rename directory


Added:
   trunk/mysqlqb/Makefile
   trunk/mysqlqb/main.css
   trunk/mysqlqb/mysqlqb.xml
Modified:
   trunk/Makefile

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


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-01-11 17:59:18 UTC (rev 4453)
+++ trunk/Makefile	2007-01-11 18:09:20 UTC (rev 4454)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 577 bytes

@@ -4,9 +4,9 @@
 
 # Set list of subdirectories
 
-SUBDIRS = administrator gui-common guibook guihelp \
+SUBDIRS = administrator gui-common guibook \
 	internals migration-toolkit \
-	mysqltest ndbapi proto-doc query-browser \
+	mysqlqb mysqltest ndbapi proto-doc query-browser \
 	refman-4.1 refman-5.0 refman-5.1 refman-common \
 	userguide workbench sample-data/world sample-data/sakila
 


Added: trunk/mysqlqb/Makefile
===================================================================
--- trunk/mysqlqb/Makefile	                        (rev 0)
+++ trunk/mysqlqb/Makefile	2007-01-11 18:09:20 UTC (rev 4454)
Changed blocks: 1, Lines Added: 107, Lines Deleted: 0; 3510 bytes

@@ -0,0 +1,107 @@
+# Makefile for creating GUI tools help files
+
+# The mysqlqb help stuff is created from a subset of the ../refman-5.0
+# chapter files.  We construct it by copying the files from that directory
+# into this directory (under the different names used by the GUI team)
+# and construct a mysqlqb.xml file that Xincludes the chapter files.
+# Then we format it using the %.guihelp rule to create individual
+# output files per chapter.
+
+# *** IMPORTANT ***
+# If you add files to the set of files processed here, you'll also
+# need to change the %.guihelp target rule in $(MAKE_DIR)/xml-guihelp.
+
+# References from an included file to another resolve as expected.
+# References to non-included files resolve to links to the online
+# manual (via the ID-mapping machinery).
+
+# Location of repository root relative to current directory
+REPO_ROOT = ..
+
+# Location of directory containing Makefile components
+MAKE_DIR = $(REPO_ROOT)/make.d
+
+# Set any variables here that should override imported standard variables
+
+DOC_LANG = en
+HTML_CSS_FILE = main.css
+
+# Set IDMAP and remap variables
+
+IDMAP_LANG = $(DOC_LANG)
+IDMAP_MAIN = mysqlqb
+IDMAP_VER = 5.0
+
+IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
+IDMAP_REFS = . ../refman-common ../refman-5.0
+IDMAP_SRCS = $(MYSQLQB_SRCS) $(wildcard ../refman-common/*.xml)
+IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
+
+# Import standard variables
+
+include $(MAKE_DIR)/vars-layout
+include $(MAKE_DIR)/vars-shell
+include $(MAKE_DIR)/vars-docbook
+
+# Import default target rule (causes help message to print)
+
+include $(MAKE_DIR)/default-target
+
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
+depend:: mysqlqb.depend
+
+MYSQLQB_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent
+
+MYSQLQB_SRCS = $(MYSQLQB_SRCS_EXTRA) mysqlqb.xml mysqlqb_functions.xml mysqlqb_statements.xml 
+
+mysqlqb-prepped.xml: $(MYSQLQB_SRCS) $(IDMAP_OBJS)
+mysqlqb-manprepped.xml: $(MYSQLQB_SRCS) $(IDMAP_OBJS)
+
+# This is necessary to help along "make depend" because we need some
+# files from another directory
+
+mysqlqb.depend: versions.ent mysqlqb_functions.xml mysqlqb_statements.xml
+
+versions.ent: ../refman-5.0/versions.ent
+	cp $^ $@
+mysqlqb_functions.xml: ../refman-5.0/functions.xml
+	cp $^ $@
+mysqlqb_statements.xml: ../refman-5.0/sql-syntax.xml
+	cp $^ $@
+
+toc: $(MYSQLQB_SRCS) $(XSL_DIR)/mysql-guihelp-toc.xsl
+	-$(RM) -r $@ $@-tmp
+	mkdir $@-tmp
+	$(XSLTPROC) \
+		--param extract.list.items 1 \
+		--output $@-tmp/mysqlqb_functions.xml \
+		$(XSL_DIR)/mysql-guihelp-toc.xsl \
+		mysqlqb_functions.xml
+	$(XSLTPROC) \
+		--param extract.list.items 0 \
+		--output $@-tmp/mysqlqb_statements.xml \
+		$(XSL_DIR)/mysql-guihelp-toc.xsl \
+		mysqlqb_statements.xml
+	mv $@-tmp $@
+
+clean::
+	$(RM) versions.ent mysqlqb_functions.xml mysqlqb_statements.xml
+	$(RM) -r toc toc-tmp
+
+# Import standard target rules
+
+include $(MAKE_DIR)/xml-dynxml
+include $(MAKE_DIR)/xml-valid
+include $(MAKE_DIR)/xml-format
+include $(MAKE_DIR)/xml-useless
+include $(MAKE_DIR)/xml-prep
+include $(MAKE_DIR)/xml-guihelp
+include $(MAKE_DIR)/xml-depend
+
+# Import directory specific extensions
+
+include ../refman-common/Makefile.ext
+include ../refman-5.0/Makefile.ext


Added: trunk/mysqlqb/main.css
===================================================================
--- trunk/mysqlqb/main.css	                        (rev 0)
+++ trunk/mysqlqb/main.css	2007-01-11 18:09:20 UTC (rev 4454)
Changed blocks: 1, Lines Added: 360, Lines Deleted: 0; 5336 bytes

@@ -0,0 +1,360 @@
+body,th,td,div,p,h1,h2,li,dt,dd {
+ font-family: Tahoma, sans-serif; font-size: 12px
+}
+
+body {
+ margin: 6px;
+ color: #333333;
+ background-color: #ffffff;
+}
+
+img.box {
+ vertical-align: middle;
+}
+
+a:link {
+ color: #006486;
+}
+a:active {
+ color: #0d93b6;
+}
+a:hover {
+ color: #64bfdb;
+}
+a:visited {
+ color: #4e5265;
+}
+
+/* work around issue with docbook-generated pages */
+a[id]:hover {
+ color: inherit;
+}
+
+a img {
+ border: 0px;
+ color: #ffffff; /* makes border disappear in ns4 (sometimes) */
+}
+
+h1, h2 {
+ font-size: larger;
+}
+
+ul {
+ list-style-image: url(images/box.png);
+ list-style-type: square;
+}
+
+table.data {
+ border-collapse: collapse;
+ border: 1px solid #bdcebb;
+}
+table.data th {
+ border: 1px solid #bdcebb;
+ background: #cbdac9;
+}
+table.data td {
+ border: 1px solid #bdcebb;
+ background: #e3ebe2;
+}
+
+input.required, textarea.required {
+ background: #e3ebe2;
+}
+input.bad, textarea.bad {
+ background: #ffcd76;
+}
+
+.error, .errors {
+ color: #e18a07;
+}
+
+p.byline {
+ font-size: smaller;
+ font-weight: bold;
+}
+
+#header {
+ width: 100%;
+ border: 0px;
+ margin: 0px;
+ padding: 0px;
+ border-spacing: 0px;
+}
+#header td {
+ padding: 0px;
+ font-size: 12px;
+}
+
+#header #logo {
+ vertical-align: middle;
+}
+#header #logo img {
+/*/*/
+ margin: 2px 15px;
+ border: none; /* workaround for layout quirk in ie5.5 */
+/* stupid ns4. */
+}
+
+#header #tagline {
+ font-size: 12px;
+ font-weight: bold;
+ font-style: italic;
+ color: #006486;
+ white-space: nowrap;
+}
+
+#header #navigation {
+ color: #666666;
+ text-align: right;
+ white-space: nowrap;
+}
+#header #searchfields {
+ padding: 0px 10px;
+}
+
+#search {
+ margin: 0px;
+}
+
+#search #q {
+ font-size: 11px;
+/*/*/
+ width: 100px;
+ padding: 3px 4px;
+ border: 1px solid #bdcebb;
+/* stupid ns4. */
+}
+#search #submit {
+ background: #bdcebb;
+ color: #ffffff;
+ font-weight: bold;
+/*/*/
+ border: 1px outset #bdcebb;
+ font-size: 10px;
+ voice-family: "\"}\""; 
+ voice-family: inherit;
+ padding: 3px 4px;
+/* stupid ns4. */
+} 
+#header #topnav {
+ vertical-align: bottom;
+}
+
+#topnav table {
+ border-spacing: 0px;
+ height: 18px;
+}
+
+#topnav td {
+ padding: 2px 8px;
+ background-color: #e2e9eb;
+ white-space: nowrap;
+ border: none;
+ font-size: 12px;
+ text-align: center;
+}
+#topnav td.sep {
+ padding: 0px;
+}
+#topnav td.sep img {
+ display: block;
+}
+
+#topnav td.a {
+ background-color: #1d93b6; 
+}
+#topnav td.s {
+ background-color: #bdcebb; 
+}
+
+#topnav a:link {
+ text-decoration: none;
+ color: #000000;
+}
+#topnav a:visited {
+ text-decoration: none;
+ color: #000000;
+}
+#topnav a:hover {
+ text-decoration: underline;
+ color: #000000;
+}
+
+#topnav td.a a:link {
+ text-decoration: none;
+ color: #ffffff;
+}
+#topnav td.a a:visited {
+ text-decoration: none;
+ color: #ffffff;
+}
+#topnav td.a a:hover {
+ text-decoration: underline;
+ color: #ffffff;
+}
+
+#topnav td.s a:link {
+ text-decoration: none;
+ color: #000000;
+}
+#topnav td.s a:visited {
+ text-decoration: none;
+ color: #000000;
+}
+#topnav td.s a:hover {
+ text-decoration: underline;
+}
+
+#subnav {
+ background-color: #1d93b6;
+ height: 19px;
+ vertical-align: bottom;
+}
+
+#subnav #right {
+ width: 100%;
+}
+#subnav td {
+ font-size: 12px;
+ padding: 0px 4px 0px 10px;
+ border-bottom: 1px solid #2a5a8a;
+ vertical-align: bottom;
+ white-space: nowrap;
+}
+#subnav td.sep {
+ padding: 0px;
+ border-bottom: 1px solid #ffffff;
+ border-bottom: none;
+}
+#subnav td.sep img {
+ padding: 0px;
+ display: block;
+}
+#subnav td.u {
+ background: #ffffff;
+ padding-left: 0px;
+ border-bottom: 1px solid #ffffff;
+}
+#subnav img {
+ vertical-align: bottom;
+}
+
+#subnav a:link {
+ text-decoration: none;
+ color: #ffffff;
+}
+#subnav a:visited {
+ text-decoration: none;
+ color: #ffffff;
+}
+#subnav a:hover {
+ text-decoration: underline;
+}
+
+#subnav td.p {
+ background: #e2e9eb;
+ padding-left: 0px;
+ border-bottom: 1px solid #e2e9eb;
+}
+#subnav td.u a:link, #subnav td.p a:link {
+ text-decoration: none;
+ color: #000000;
+}
+#subnav td.u a:visited, #subnav td.p a:visited {
+ text-decoration: none;
+ color: #000000;
+}
+#subnav td.u a:hover, #subnav td.p a:hover {
+ text-decoration: underline;
+}
+
+.shim {
+ clear: both;
+}
+
+#contents {
+ position: relative;
+}
+#contentspacer {
+ float: left;
+ width: 0px;
+ height: 500px;
+}
+
+#body {
+ margin: 10px 30px;
+}
+
+#content {
+ border: none;
+ padding-right: 19px;
+ margin: 10px 240px 10px 30px;
+ border-right: 1px solid #e3ebe2;
+}
+
+h1.title {
+ color: #1d93b6;
+}
+
+h1.title {
+ position: relative;
+ left: -10px;
+}
+
+#sidebar {
+ border: none;
+ margin-top: 10px;
+ margin-right: 10px;
+ 
+ width: 220px;
+
+ /*/*/
+ position: absolute;
+ left: auto;
+ right: 0px;
+ top: 0px;
+}
+/* */
+
+div.promo {
+ margin-top: 10px;
+ background: #e4ebe4;
+ border: none;
+ padding: 10px;
+}
+div.promo p {
+ margin-top: 0px;
+}
+
+#sidebar #related h2 {
+ font-size: larger;
+ border-bottom: 1px solid #e4ebe4;
+}
+
+#sidebar #related ul {
+ list-style-type: none;
+ list-style-image: none;
+ margin-left: 0px;
+ padding-left: 0px;
+}
+
+#footer {
+ font-size: smaller;
+ clear: both;
+ border: none;
+ background: #e3ebe2;
+ margin-top: 20px;
+ padding-left: 30px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+
+#footer a:link {
+ color: #666666;
+}
+#footer a:active, .footer a:hover {
+ color: #006486;
+}
+#footer a:visited {
+ color: #949494;
+}


Added: trunk/mysqlqb/mysqlqb.xml
===================================================================
--- trunk/mysqlqb/mysqlqb.xml	                        (rev 0)
+++ trunk/mysqlqb/mysqlqb.xml	2007-01-11 18:09:20 UTC (rev 4454)
Changed blocks: 1, Lines Added: 22, Lines Deleted: 0; 999 bytes

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % fixedchars.entities  SYSTEM "../common/fixedchars.ent">
+  %fixedchars.entities;
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
+  %urls.entities;
+  <!ENTITY % phrases.entities       SYSTEM "../common/phrases.ent">
+  %phrases.entities;
+  <!ENTITY % versions.entities    SYSTEM "versions.ent">
+  %versions.entities;
+]>
+<book id="top" lang="en">
+
+  <title>Query Browser Help</title>
+
+  <xi:include href="mysqlqb_functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+  <xi:include href="mysqlqb_statements.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+</book>


Thread
svn commit - mysqldoc@docsrva: r4454 - in trunk: . mysqlqbpaul11 Jan