List:Commits« Previous MessageNext Message »
From:paul.dubois Date:December 1 2010 2:35am
Subject:svn commit - mysqldoc@docsrva: r24149 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6
View as plain text  
Author: paul
Date: 2010-12-01 03:35:23 +0100 (Wed, 01 Dec 2010)
New Revision: 24149

Log:
 r66297@frost:  paul | 2010-11-30 20:30:33 -0500
 The conversion to CMake makes make_binary_distribution and make_win_bin_dist
 obsolete. Just use "make package" now.


Modified:
   trunk/dynamic-docs/changelog/mysqld-2.xml
   trunk/refman-5.5/programs-installation.xml
   trunk/refman-5.5/programs.xml
   trunk/refman-5.6/programs-installation.xml
   trunk/refman-5.6/programs.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44896
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66286
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44896
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66297
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml	2010-12-01 02:02:24 UTC (rev 24148)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml	2010-12-01 02:35:23 UTC (rev 24149)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 635 bytes

@@ -33279,6 +33279,13 @@
         to notes for specific platforms.
       </para>
 
+      <para>
+        The <command>make_binary_distribution</command> and
+        <literal>make_win_bin_dist</literal> scripts are now obsolete.
+        To create a binary distribution, use <command>make
+        package</command>.
+      </para>
+
     </message>
 
   </logentry>


Modified: trunk/refman-5.5/programs-installation.xml
===================================================================
--- trunk/refman-5.5/programs-installation.xml	2010-12-01 02:02:24 UTC (rev 24148)
+++ trunk/refman-5.5/programs-installation.xml	2010-12-01 02:35:23 UTC (rev 24149)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 184; 6998 bytes

@@ -350,201 +350,22 @@
       <refpurpose>package MySQL distribution as ZIP archive</refpurpose>
     </refnamediv>
 
-    <refsynopsisdiv>
-      <cmdsynopsis>
-        <command>make_win_bin_dist [<replaceable>options</replaceable>] <replaceable>package_basename</replaceable> [<replaceable>copy_def</replaceable> ...]</command>
-      </cmdsynopsis>
-    </refsynopsisdiv>
-
     <refsection id="make-win-bin-dist-description">
 
       <title>Description</title>
 
       <para>
-        This script is used on Windows after building a MySQL
-        distribution from source to create executable programs. It
-        packages the binaries and support files into a ZIP archive that
+        Previously, this script was used on Windows after building a
+        MySQL distribution from source to create executable programs. It
+        packaged the binaries and support files into a ZIP archive that
         can be unpacked at the location where you want to install MySQL.
       </para>
 
       <para>
-        <command>make_win_bin_dist</command> is a shell script, so you
-        must have Cygwin installed to use it.
+        To create a binary distribution now, execute <command>make
+        package</command> in the top-level directory of the source tree.
       </para>
 
-      <para>
-        This program's use is subject to change. Currently, you invoke
-        it as follows from the root directory of your source
-        distribution:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>make_win_bin_dist [<replaceable>options</replaceable>] <replaceable>package_basename</replaceable> [<replaceable>copy_def</replaceable> ...]</userinput>
-</programlisting>
-
-      <para>
-        The <replaceable>package_basename</replaceable> argument
-        provides the basename for the resulting ZIP archive. This name
-        will be the name of the directory that results from unpacking
-        the archive.
-      </para>
-
-      <para>
-        Because you might want to include files of directories from
-        other builds, you can instruct this script to copy them in for
-        you, using <replaceable>copy_def</replaceable> arguments, which
-        have the form
-        <replaceable>relative_dest_name</replaceable>=<replaceable>source_name</replaceable>.
-      </para>
-
-      <para>
-        Example:
-      </para>
-
-<programlisting>
-bin/mysqld-max.exe=../my-max-build/sql/release/mysqld.exe
-</programlisting>
-
-      <para>
-        If you specify a directory, the entire directory will be copied.
-      </para>
-
-      <para>
-        <command>make_win_bin_dist</command> supports the following
-        options.
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_debug">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>debug option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>debug option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--debug</option>
-          </para>
-
-          <para>
-            Pack the debug binaries and produce an error if they were
-            not built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_embedded">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>embedded option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>embedded option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--embedded</option>
-          </para>
-
-          <para>
-            Pack the embedded server and produce an error if it was not
-            built. The default is to pack it if it was built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_exe-suffix">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>exe-suffix option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>exe-suffix option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--exe-suffix=<replaceable>suffix</replaceable></option>
-          </para>
-
-          <para>
-            Add a suffix to the basename of the <command>mysql</command>
-            binary. For example, a suffix of <literal>-abc</literal>
-            produces a binary named <command>mysqld-abc.exe</command>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_no-debug">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>no-debug option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>no-debug option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--no-debug</option>
-          </para>
-
-          <para>
-            Do not pack the debug binaries even if they were built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_no-embedded">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>no-embedded option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>no-embedded option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--no-embedded</option>
-          </para>
-
-          <para>
-            Do not pack the embedded server even if it was built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_only-debug">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>only-debug option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>only-debug option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--only-debug</option>
-          </para>
-
-          <para>
-            Use this option when the target for this build was
-            <literal>Debug</literal>, and you just want to replace the
-            normal binaries with debug versions (that is, do not use
-            separate <filename>debug</filename> directories).
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
     </refsection>
 
   </refentry>


Modified: trunk/refman-5.5/programs.xml
===================================================================
--- trunk/refman-5.5/programs.xml	2010-12-01 02:02:24 UTC (rev 24148)
+++ trunk/refman-5.5/programs.xml	2010-12-01 02:35:23 UTC (rev 24149)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 34; 1340 bytes

@@ -160,40 +160,6 @@
       <listitem>
         <para>
           <indexterm>
-            <primary>make_binary_distribution</primary>
-          </indexterm>
-
-          <command>make_binary_distribution</command>
-        </para>
-
-        <para>
-          This program makes a binary release of a compiled MySQL. This
-          could be sent by FTP to
-          <filename>/pub/mysql/upload/</filename> on
-          <literal>ftp.mysql.com</literal> for the convenience of other
-          MySQL users.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <indexterm>
-            <primary>make_win_bin_dist</primary>
-          </indexterm>
-
-          <command>make_win_bin_dist</command>
-        </para>
-
-        <para>
-          This program is used on Windows. It packages a MySQL
-          distribution for installation after the source distribution
-          has been built. See <xref linkend="make-win-bin-dist"/>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <indexterm>
             <primary>mysql_install_db</primary>
           </indexterm>
 


Modified: trunk/refman-5.6/programs-installation.xml
===================================================================
--- trunk/refman-5.6/programs-installation.xml	2010-12-01 02:02:24 UTC (rev 24148)
+++ trunk/refman-5.6/programs-installation.xml	2010-12-01 02:35:23 UTC (rev 24149)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 184; 6998 bytes

@@ -350,201 +350,22 @@
       <refpurpose>package MySQL distribution as ZIP archive</refpurpose>
     </refnamediv>
 
-    <refsynopsisdiv>
-      <cmdsynopsis>
-        <command>make_win_bin_dist [<replaceable>options</replaceable>] <replaceable>package_basename</replaceable> [<replaceable>copy_def</replaceable> ...]</command>
-      </cmdsynopsis>
-    </refsynopsisdiv>
-
     <refsection id="make-win-bin-dist-description">
 
       <title>Description</title>
 
       <para>
-        This script is used on Windows after building a MySQL
-        distribution from source to create executable programs. It
-        packages the binaries and support files into a ZIP archive that
+        Previously, this script was used on Windows after building a
+        MySQL distribution from source to create executable programs. It
+        packaged the binaries and support files into a ZIP archive that
         can be unpacked at the location where you want to install MySQL.
       </para>
 
       <para>
-        <command>make_win_bin_dist</command> is a shell script, so you
-        must have Cygwin installed to use it.
+        To create a binary distribution now, execute <command>make
+        package</command> in the top-level directory of the source tree.
       </para>
 
-      <para>
-        This program's use is subject to change. Currently, you invoke
-        it as follows from the root directory of your source
-        distribution:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>make_win_bin_dist [<replaceable>options</replaceable>] <replaceable>package_basename</replaceable> [<replaceable>copy_def</replaceable> ...]</userinput>
-</programlisting>
-
-      <para>
-        The <replaceable>package_basename</replaceable> argument
-        provides the basename for the resulting ZIP archive. This name
-        will be the name of the directory that results from unpacking
-        the archive.
-      </para>
-
-      <para>
-        Because you might want to include files of directories from
-        other builds, you can instruct this script to copy them in for
-        you, using <replaceable>copy_def</replaceable> arguments, which
-        have the form
-        <replaceable>relative_dest_name</replaceable>=<replaceable>source_name</replaceable>.
-      </para>
-
-      <para>
-        Example:
-      </para>
-
-<programlisting>
-bin/mysqld-max.exe=../my-max-build/sql/release/mysqld.exe
-</programlisting>
-
-      <para>
-        If you specify a directory, the entire directory will be copied.
-      </para>
-
-      <para>
-        <command>make_win_bin_dist</command> supports the following
-        options.
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_debug">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>debug option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>debug option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--debug</option>
-          </para>
-
-          <para>
-            Pack the debug binaries and produce an error if they were
-            not built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_embedded">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>embedded option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>embedded option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--embedded</option>
-          </para>
-
-          <para>
-            Pack the embedded server and produce an error if it was not
-            built. The default is to pack it if it was built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_exe-suffix">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>exe-suffix option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>exe-suffix option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--exe-suffix=<replaceable>suffix</replaceable></option>
-          </para>
-
-          <para>
-            Add a suffix to the basename of the <command>mysql</command>
-            binary. For example, a suffix of <literal>-abc</literal>
-            produces a binary named <command>mysqld-abc.exe</command>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_no-debug">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>no-debug option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>no-debug option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--no-debug</option>
-          </para>
-
-          <para>
-            Do not pack the debug binaries even if they were built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_no-embedded">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>no-embedded option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>no-embedded option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--no-embedded</option>
-          </para>
-
-          <para>
-            Do not pack the embedded server even if it was built.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para id="option_make_win_bin_dist_only-debug">
-            <indexterm>
-              <primary>make_win_bin_dist</primary>
-              <secondary>only-debug option</secondary>
-            </indexterm>
-
-            <indexterm>
-              <primary>only-debug option</primary>
-              <secondary>make_win_bin_dist</secondary>
-            </indexterm>
-
-            <option role="make_win_bin_dist">--only-debug</option>
-          </para>
-
-          <para>
-            Use this option when the target for this build was
-            <literal>Debug</literal>, and you just want to replace the
-            normal binaries with debug versions (that is, do not use
-            separate <filename>debug</filename> directories).
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
     </refsection>
 
   </refentry>


Modified: trunk/refman-5.6/programs.xml
===================================================================
--- trunk/refman-5.6/programs.xml	2010-12-01 02:02:24 UTC (rev 24148)
+++ trunk/refman-5.6/programs.xml	2010-12-01 02:35:23 UTC (rev 24149)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 34; 1340 bytes

@@ -160,40 +160,6 @@
       <listitem>
         <para>
           <indexterm>
-            <primary>make_binary_distribution</primary>
-          </indexterm>
-
-          <command>make_binary_distribution</command>
-        </para>
-
-        <para>
-          This program makes a binary release of a compiled MySQL. This
-          could be sent by FTP to
-          <filename>/pub/mysql/upload/</filename> on
-          <literal>ftp.mysql.com</literal> for the convenience of other
-          MySQL users.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <indexterm>
-            <primary>make_win_bin_dist</primary>
-          </indexterm>
-
-          <command>make_win_bin_dist</command>
-        </para>
-
-        <para>
-          This program is used on Windows. It packages a MySQL
-          distribution for installation after the source distribution
-          has been built. See <xref linkend="make-win-bin-dist"/>.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          <indexterm>
             <primary>mysql_install_db</primary>
           </indexterm>
 


Thread
svn commit - mysqldoc@docsrva: r24149 - in trunk: . dynamic-docs/changelog refman-5.5 refman-5.6paul.dubois1 Dec