Hi Kent, all !
I agree with the approach you are taking.
My general question is:
Do you really think this fix should be applied to 4.0, which is EOL ?
I propose not to change 4.0 for this (too old), most likely also not 4.1
(I doubt there are many people building that from source) -
I don't even know whether our public BK trees offer these two versions.
I propose to start this change in 5.0,
but frequent source builds of 4.* versions would make me change my mind.
In the placeholder files, I would prefer to see a hint that this is a
snapshot build.
I have inserted this and other comments below.
Also, I don't exactly see how this changeset goes together with your
"1.2216" changeset to 4.0, affecting only "Docs/Makefile.am".
Could you please collapse them for review ?
Jörg
kent@stripped wrote:
> Below is the list of changes that have just been committed into a local
> 4.0 repository of kent. When kent 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html
>
> ChangeSet@stripped, 2007-11-02 12:29:13+01:00, kent@stripped +6 -0
> mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am:
> Let place holders for real documentation have text that
> makes sense to the user (Bug#25205)
Please mention explicitly that this affects bsnapshout builds from the
source trees only, not release tarballs.
>
> BitKeeper/deleted/.del-generate-text-files.pl@stripped, 2007-11-02 01:13:38+01:00,
> kent@stripped +0 -0
> Delete: Docs/Support/generate-text-files.pl
>
> Docs/INSTALL-BINARY@stripped, 2007-11-02 01:29:32+01:00, kent@stripped +8 -0
> BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY
>
> Docs/INSTALL-BINARY@stripped, 2007-11-02 01:29:32+01:00, kent@stripped +0 -0
>
> Docs/Makefile.am@stripped, 2007-11-02 01:32:35+01:00, kent@stripped +3 -26
> Don't generate text files from the documentation
>
> Docs/mysql.info@stripped, 2007-11-02 01:31:55+01:00, kent@stripped +3 -26
> More of a end-user text
>
> INSTALL-SOURCE@stripped, 2007-11-02 01:29:32+01:00, kent@stripped +8 -0
> BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE
>
> INSTALL-SOURCE@stripped, 2007-11-02 01:29:32+01:00, kent@stripped +0 -0
>
> support-files/MacOSX/ReadMe.txt@stripped, 2007-11-02 01:29:32+01:00, kent@stripped +8
> -0
> BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt
>
> support-files/MacOSX/ReadMe.txt@stripped, 2007-11-02 01:29:32+01:00, kent@stripped +0
> -0
>
> # 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: kent
> # Host: kent-amd64.(none)
> # Root: /home/kent/bk/bug25205/mysql-4.0
>
> --- 1.56/Docs/Makefile.am 2007-11-02 12:29:17 +01:00
> +++ 1.57/Docs/Makefile.am 2007-11-02 12:29:17 +01:00
> @@ -14,38 +14,15 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>
> -noinst_SCRIPTS = Support/generate-text-files.pl
> -
> -EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY
> -
> -all: txt_files
Is it really good to drop this first (= default) "make" target ?
Also, is it good to have no "all" target any more ?
I vote to keep it, even if we should not call it in our tools.
> -
> -txt_files: ../INSTALL-SOURCE \
> - INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
> +EXTRA_DIST = mysql.info INSTALL-BINARY
>
> # make sure that "make install" installs the info page, too
> # automake only seems to take care of this automatically,
> # if we're building the info page from texi directly.
> -install-data-hook: mysql.info
> +install-data-hook: $(EXTRA_DIST)
> $(mkinstalldirs) $(DESTDIR)$(infodir)
> $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
> -
> -CLEAN_FILES: $(txt_files)
> - touch $(txt_files)
> -
> -GT = $(srcdir)/Support/generate-text-files.pl
> -
> -../INSTALL-SOURCE: mysql.info $(GT)
> - perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
> -
> -# We put the description for the binary installation here so that
> -# people who download source wont have to see it. It is moved up to
> -# the toplevel by the script that makes the binary tar files.
> -INSTALL-BINARY: mysql.info $(GT)
> - perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
> -
> -../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
> - perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
> + $(INSTALL_DATA) $(srcdir)/INSTALL-BINARY $(DESTDIR)$(infodir)
>
> # Don't update the files from bitkeeper
> %::SCCS/s.%
> --- New file ---
> +++ Docs/INSTALL-BINARY 07/11/02 01:29:32
Add a sentence here, telling something like:
This is a snapshot build of some intermediate development state.
These program versions have not been tested and verified by MySQL AB.
>
> You can find information about how to install binary distributions at
>
> http://dev.mysql.com/doc/refman/4.1/en/quick-standard-installation.html
>
> The MySQL Reference Manual is also available in various formats on
> http://dev.mysql.com/doc; if you're interested in the DocBook XML
> sources go to http://svn.mysql.com.
>
> --- New file ---
> +++ INSTALL-SOURCE 07/11/02 01:29:32
Add a sentence here, telling something like:
This is a snapshot build of some intermediate development state.
These program versions have not been tested and verified by MySQL AB.
>
> You can find information about how to install from a source distributions at
>
> http://dev.mysql.com/doc/refman/4.1/en/installing-source.html
>
> The MySQL Reference Manual is also available in various formats on
> http://dev.mysql.com/doc; if you're interested in the DocBook XML
> sources go to http://svn.mysql.com.
>
> --- New file ---
> +++ support-files/MacOSX/ReadMe.txt 07/11/02 01:29:32
Add a sentence here, telling something like:
This is a snapshot build of some intermediate development state.
These program versions have not been tested and verified by MySQL AB.
>
> You can find information about how to install on Mac OS X at
>
> http://dev.mysql.com/doc/refman/4.1/en/mac-os-x-installation.html
>
> The MySQL Reference Manual is also available in various formats on
> http://dev.mysql.com/doc; if you're interested in the DocBook XML
> sources go to http://svn.mysql.com.
>
>
> --- 1.1/Docs/mysql.info 2007-11-02 12:29:17 +01:00
> +++ 1.2/Docs/mysql.info 2007-11-02 12:29:17 +01:00
> @@ -1,27 +1,4 @@
> -This is mysql.info, produced by makeinfo version 4.8 from manual.texi.
>
> -START-INFO-DIR-ENTRY
> -* mysql: (mysql). MySQL documentation.
> -END-INFO-DIR-ENTRY
> -
> -
> -File: mysql.info, Node: Top, Next: (dir), Prev: (dir), Up: (dir)
> -
> -This is an empty placeholder file for the MySQL manual.
> -
> -The MySQL manual is now maintained in a separate BitKeeper source tree!
> -Please see 'http://www.mysql.com/doc/en/Installing_source_tree.html'
> -for more info on how to work with BitKeeper.
> -
> -This file will be replaced with the current 'mysql.info' when building
> -the official source distribution.
> -
> -You can find a specific manual for any older version of MySQL in the
> -binary or source distribution for that version.
> -
> -
> -
> -Tag Table:
> -Node: Top_166
> -
> -End Tag Table
Add a sentence here, telling something like:
This is a snapshot build of some intermediate development state.
These program versions have not been tested and verified by MySQL AB.
> +The MySQL Reference Manual is available in various formats on
> +http://dev.mysql.com/doc; if you're interested in the DocBook XML
> +sources go to http://svn.mysql.com.
>
--
Joerg Bruehe, Senior Production Engineer
MySQL AB, www.mysql.com
Office: (+49 30) 417 01 487 VoIP: 4464@stripped
