bk commit into 5.0 tree (kent:1.2583) BUG#35104

[kent]

Below is the list of changes that have just been committed into a local
5.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, 2008-03-11 15:21:58+01:00, kent@stripped +1 -0
  make_win_bin_dist:
    Include .pdb files for tools and libraries (bug#35104)

  scripts/make_win_bin_dist@stripped, 2008-03-11 15:21:17+01:00, kent@stripped +27 -13
    Include .pdb files for tools and libraries (bug#35104)

diff -Nrup a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
--- a/scripts/make_win_bin_dist	2007-12-28 22:57:07 +01:00
+++ b/scripts/make_win_bin_dist	2008-03-11 15:21:17 +01:00
@@ -26,8 +26,7 @@ set -e
 # NOTE: Pattern matching with "{..,..}" can't be used, not portable.
 # ----------------------------------------------------------------------
 
-# FIXME FIXME "debug", own build or handled here?
-# FIXME FIXME add way to copy from other builds executables
+# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"?
 
 usage()
 {
@@ -150,13 +149,16 @@ cp myisam/$TARGET/*.exe                 
 cp server-tools/instance-manager/$TARGET/*.{exe,map}     $DESTDIR/bin/
 if [ x"$TARGET" != x"release" ] ; then
   cp server-tools/instance-manager/$TARGET/*.pdb         $DESTDIR/bin/
+  cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
+  cp client/$TARGET/mysqladmin.pdb                       $DESTDIR/bin/
+  cp client/$TARGET/mysqlbinlog.pdb                      $DESTDIR/bin/
+  cp client/$TARGET/mysqldump.pdb                        $DESTDIR/bin/
+  cp client/$TARGET/mysqlimport.pdb                      $DESTDIR/bin/
+  cp client/$TARGET/mysqlshow.pdb                        $DESTDIR/bin/
 fi
 cp tests/$TARGET/*.exe                                   $DESTDIR/bin/
 cp libmysql/$TARGET/libmysql.dll                         $DESTDIR/bin/
 
-# FIXME really needed?!
-mv $DESTDIR/bin/comp_err.exe             $DESTDIR/bin/comp-err.exe
-
 if [ -f "sql/$TARGET/mysqld-nt.exe" ] ; then
   BASENAME="mysqld-nt"     # Old style non CMake build 
 else
@@ -191,10 +193,6 @@ if [ -d win/data ] ; then
   cp -pR win/data $DESTDIR/
 fi
 
-# FIXME maybe a flag to define "release build", or do the
-# check from the calling script that all these are there,
-# and with the correct content.
-
 mkdir $DESTDIR/Docs
 cp Docs/INSTALL-BINARY    $DESTDIR/Docs/
 cp Docs/manual.chm        $DESTDIR/Docs/ || /bin/true
@@ -218,11 +216,13 @@ copy_embedded()
            $DESTDIR/include
   cp libmysqld/libmysqld.def           $DESTDIR/include/
   cp libmysqld/$TARGET/mysqlserver.lib $DESTDIR/Embedded/static/release/
-  cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/
   cp libmysqld/$TARGET/libmysqld.dll   $DESTDIR/Embedded/DLL/release/
   cp libmysqld/$TARGET/libmysqld.exp   $DESTDIR/Embedded/DLL/release/
   cp libmysqld/$TARGET/libmysqld.lib   $DESTDIR/Embedded/DLL/release/
-  cp libmysqld/$TARGET/libmysqld.pdb   $DESTDIR/Embedded/DLL/release/
+  if [ x"$TARGET" != x"release" ] ; then
+    cp libmysqld/$TARGET/mysqlserver.pdb $DESTDIR/Embedded/static/release/
+    cp libmysqld/$TARGET/libmysqld.pdb   $DESTDIR/Embedded/DLL/release/
+  fi
 
   if [ x"$PACK_DEBUG" = x"" -a -f "libmysqld/debug/libmysqld.lib" -o \
        x"$PACK_DEBUG" = x"yes" ] ; then
@@ -287,7 +287,6 @@ cp include/mysql.h \
 
 # ----------------------------------------------------------------------
 # Client libraries, and other libraries
-# FIXME why "libmysql.dll" installed both in "bin" and "lib/opt"?
 # ----------------------------------------------------------------------
 
 mkdir -p $DESTDIR/lib/opt
@@ -299,16 +298,31 @@ cp libmysql/$TARGET/libmysql.dll \
    strings/$TARGET/strings.lib \
    zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
 
+if [ x"$TARGET" != x"release" ] ; then
+  cp libmysql/$TARGET/libmysql.pdb \
+     libmysql/$TARGET/mysqlclient.pdb \
+     mysys/$TARGET/mysys.pdb \
+     regex/$TARGET/regex.pdb \
+     strings/$TARGET/strings.pdb \
+     zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/
+fi
+
 if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
      x"$PACK_DEBUG" = x"yes" ] ; then
   mkdir -p $DESTDIR/lib/debug
   cp libmysql/debug/libmysql.dll \
      libmysql/debug/libmysql.lib \
+     libmysql/debug/libmysql.pdb \
      libmysql/debug/mysqlclient.lib \
+     libmysql/debug/mysqlclient.pdb \
      mysys/debug/mysys.lib \
+     mysys/debug/mysys.pdb \
      regex/debug/regex.lib \
+     regex/debug/regex.pdb \
      strings/debug/strings.lib \
-     zlib/debug/zlib.lib $DESTDIR/lib/debug/
+     strings/debug/strings.pdb \
+     zlib/debug/zlib.lib \
+     zlib/debug/zlib.pdb $DESTDIR/lib/debug/
 fi
 
 # ----------------------------------------------------------------------