bzr push into mysql-5.1 branch (df:2709 to 2711)

[Daniel Fischer]

 2711 Daniel Fischer	2008-10-21
      doc fix
modified:
  win/README

 2710 Daniel Fischer	2008-10-21
      make packaging fail earlier
modified:
  client/CMakeLists.txt
  extra/CMakeLists.txt
  libmysql/CMakeLists.txt
  libmysqld/CMakeLists.txt
  mysys/CMakeLists.txt
  regex/CMakeLists.txt
  server-tools/instance-manager/CMakeLists.txt
  sql/CMakeLists.txt
  storage/myisam/CMakeLists.txt
  strings/CMakeLists.txt
  tests/CMakeLists.txt
  win/install_macros.cmake
  zlib/CMakeLists.txt

 2709 Daniel Fischer	2008-10-21
      minor fixes
modified:
  BUILD/compile-dist
  win/Makefile.am
  win/README
  win/msi.cmake

=== modified file 'client/CMakeLists.txt'
--- a/client/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/client/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -81,6 +81,6 @@ IF(EMBED_MANIFESTS)
 ENDIF(EMBED_MANIFESTS)
 
 FOREACH(EXEFILE ${EXES})
-  INSTALL_REL_EXE_IF_EXISTS(${EXEFILE} bin)
-# INSTALL_DBG_EXE_IF_EXISTS(${EXEFILE} bin)
+  INSTALL_REL_EXE(${EXEFILE} bin)
+# INSTALL_DBG_EXE(${EXEFILE} bin)
 ENDFOREACH(EXEFILE)

=== modified file 'extra/CMakeLists.txt'
--- a/extra/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/extra/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -56,6 +56,6 @@ IF(EMBED_MANIFESTS)
 ENDIF(EMBED_MANIFESTS)
 
 FOREACH(EXEFILE comp_err my_print_defaults perror resolveip replace)
-  INSTALL_REL_EXE_IF_EXISTS(${EXEFILE} bin)
-# INSTALL_DBG_EXE_IF_EXISTS(${EXEFILE} bin)
+  INSTALL_REL_EXE(${EXEFILE} bin)
+# INSTALL_DBG_EXE(${EXEFILE} bin)
 ENDFOREACH(EXEFILE)

=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/libmysql/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -122,14 +122,14 @@ TARGET_LINK_LIBRARIES(mysqlclient_notls)
 
 ADD_LIBRARY(libmysql          SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
 
-INSTALL_REL_LIB_IF_EXISTS(mysqlclient lib/opt)
-INSTALL_DBG_LIB_IF_EXISTS(mysqlclient lib/debug)
+INSTALL_REL_LIB(mysqlclient lib/opt)
+INSTALL_DBG_LIB(mysqlclient lib/debug)
 
-INSTALL_REL_LIB_IF_EXISTS(libmysql lib/opt)
-INSTALL_DBG_LIB_IF_EXISTS(libmysql lib/debug)
+INSTALL_REL_LIB(libmysql lib/opt)
+INSTALL_DBG_LIB(libmysql lib/debug)
 
 # For legacy reason we want a copy of "libmysql.ddl" in "bin"
-INSTALL_REL_LIB_IF_EXISTS(libmysql bin)
+INSTALL_REL_LIB(libmysql bin)
 
 IF(WIN32)
   SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/libmysqld/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -226,7 +226,7 @@ TARGET_LINK_LIBRARIES(libmysqld mysqlser
 # CMake 2.4-patch 7 has a bug, if MODULE only the DLL gets installed,
 # and if SHARED the "libmysqld.exp" gets left out. So here we *need*
 # to use INSTALL(FILES...) instead of INSTALL(TARGETS...)
-INSTALL_REL_LIB_IF_EXISTS(libmysqld Embedded/DLL/release)
-INSTALL_DBG_LIB_IF_EXISTS(libmysqld Embedded/DLL/debug)
-INSTALL_REL_LIB_IF_EXISTS(mysqlserver Embedded/static/release)
-INSTALL_DBG_LIB_IF_EXISTS(mysqlserver Embedded/static/debug)
+INSTALL_REL_LIB(libmysqld Embedded/DLL/release)
+INSTALL_DBG_LIB(libmysqld Embedded/DLL/debug)
+INSTALL_REL_LIB(mysqlserver Embedded/static/release)
+INSTALL_DBG_LIB(mysqlserver Embedded/static/debug)

=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/mysys/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -48,6 +48,6 @@ SET(MYSYS_SOURCES  array.c charset-def.c
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(mysys ${MYSYS_SOURCES})
-  INSTALL_REL_LIB_IF_EXISTS(mysys lib/opt)
-  INSTALL_DBG_LIB_IF_EXISTS(mysys lib/debug)
+  INSTALL_REL_LIB(mysys lib/opt)
+  INSTALL_DBG_LIB(mysys lib/debug)
 ENDIF(NOT SOURCE_SUBLIBS)

=== modified file 'regex/CMakeLists.txt'
--- a/regex/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/regex/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -23,6 +23,6 @@ SET(REGEX_SOURCES debug.c regcomp.c rege
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(regex ${REGEX_SOURCES})
-  INSTALL_REL_LIB_IF_EXISTS(regex lib/opt)
-  INSTALL_DBG_LIB_IF_EXISTS(regex lib/debug)
+  INSTALL_REL_LIB(regex lib/opt)
+  INSTALL_DBG_LIB(regex lib/debug)
 ENDIF(NOT SOURCE_SUBLIBS)

=== modified file 'server-tools/instance-manager/CMakeLists.txt'
--- a/server-tools/instance-manager/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/server-tools/instance-manager/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -39,5 +39,5 @@ IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("mysqlmanager" "asInvoker")
 ENDIF(EMBED_MANIFESTS)
 
-INSTALL_REL_EXE_WITH_MAP_IF_EXISTS(mysqlmanager bin)
-#INSTALL_DBG_EXE_WITH_MAP_IF_EXISTS(mysqlmanager bin)
+INSTALL_REL_EXE_WITH_MAP(mysqlmanager bin)
+#INSTALL_DBG_EXE_WITH_MAP(mysqlmanager bin)

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/sql/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -173,5 +173,5 @@ ADD_DEPENDENCIES(udf_example strings Gen
 TARGET_LINK_LIBRARIES(udf_example strings wsock32)
 
 # FIXME we should really set "mysqld-debug" as a target, not rename
-INSTALL_REL_EXE_WITH_MAP_IF_EXISTS(mysqld bin)
-INSTALL_DBG_EXE_WITH_MAP_IF_EXISTS(mysqld bin)
+INSTALL_REL_EXE_WITH_MAP(mysqld bin)
+INSTALL_DBG_EXE_WITH_MAP(mysqld bin)

=== modified file 'storage/myisam/CMakeLists.txt'
--- a/storage/myisam/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/storage/myisam/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -61,8 +61,8 @@ IF(NOT SOURCE_SUBLIBS)
   ENDIF(EMBED_MANIFESTS)
 
   FOREACH(EXEFILE myisam_ftdump myisamchk myisamlog myisampack)
-    INSTALL_REL_EXE_IF_EXISTS(${EXEFILE} bin)
-#   INSTALL_DBG_EXE_IF_EXISTS(${EXEFILE} bin)
+    INSTALL_REL_EXE(${EXEFILE} bin)
+#   INSTALL_DBG_EXE(${EXEFILE} bin)
   ENDFOREACH(EXEFILE)
 
 ENDIF(NOT SOURCE_SUBLIBS)

=== modified file 'strings/CMakeLists.txt'
--- a/strings/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/strings/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -30,6 +30,6 @@ SET(STRINGS_SOURCES bchange.c bcmp.c bfi
 
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(strings ${STRINGS_SOURCES})
-  INSTALL_REL_LIB_IF_EXISTS(strings lib/opt)
-  INSTALL_DBG_LIB_IF_EXISTS(strings lib/debug)
+  INSTALL_REL_LIB(strings lib/opt)
+  INSTALL_DBG_LIB(strings lib/debug)
 ENDIF(NOT SOURCE_SUBLIBS)

=== modified file 'tests/CMakeLists.txt'
--- a/tests/CMakeLists.txt	2008-10-20 16:12:04 +0000
+++ b/tests/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -28,6 +28,6 @@ ADD_EXECUTABLE(bug25714 bug25714.c)
 TARGET_LINK_LIBRARIES(bug25714 mysqlclient_notls wsock32)
 
 FOREACH(EXEFILE mysql_client_test bug25714)
-  INSTALL_REL_EXE_IF_EXISTS(${EXEFILE} bin)
-# INSTALL_DBG_EXE_IF_EXISTS(${EXEFILE} bin)
+  INSTALL_REL_EXE(${EXEFILE} bin)
+# INSTALL_DBG_EXE(${EXEFILE} bin)
 ENDFOREACH(EXEFILE)

=== modified file 'win/README'
--- a/win/README	2008-10-21 10:00:18 +0000
+++ b/win/README	2008-10-21 11:30:13 +0000
@@ -108,6 +108,17 @@ the file "corewin_express.vsprops" in or
 To package to a ZIP file, like the "mysql-noinstall-XXX-win32.zip" packages
 you can download from http://dev.mysql.com/downloads/, you follow these steps.
 
+Please note that, in order to build a package of the MySQL server, you must 
+build all the parts that the packager and the installer expect. In particular, 
+you must build with the following features enabled:
+
+  * WITH_EMBEDDED_SERVER
+
+And you must build both of the following targets:
+
+  * RelWithDebInfo
+  * Debug
+
 Step 1
 ------
 Build as outlined above. Note that you can build both the optimized
@@ -126,24 +137,13 @@ Step 3
 ------
 Run from the top of the build tree
 
-  > cpack -G ZIP -C RelWithDebInfo -DARCH=win32 (or winx64)
+  > cpack -G ZIP -DARCH=win32 (or winx64)
 
 ==============================================================================
                 Create a MSI installer of MySQL on Windows
 ==============================================================================
 
-These are the steps to package using WiX. Please note that, in order to build
-an MSI package of the MySQL server, you must build all the parts that the
-installer expects. In particular, you must build with the following features
-enabled:
-
-  * WITH_EMBEDDED_SERVER
-
-And you must build both of the following targets:
-
-  * RelWithDebInfo
-  * Debug
-
+These are the steps to package using WiX. 
 
 Step 1
 ------

=== modified file 'win/install_macros.cmake'
--- a/win/install_macros.cmake	2008-07-18 19:51:51 +0000
+++ b/win/install_macros.cmake	2008-10-21 11:27:15 +0000
@@ -4,53 +4,71 @@
 #
 ##############################################################################
 
-MACRO(INSTALL_REL_EXE_IF_EXISTS FILE DEST)
-  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.exe)
-    SET(SUBDIR relwithdebinfo)
-  ELSE(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.exe)
-    SET(SUBDIR release)
-  ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.exe)
+MACRO(INSTALL_REL_EXE FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.exe DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST})
+ENDMACRO(INSTALL_REL_EXE)
 
-  INSTALL(FILES ${SUBDIR}/${FILE}.exe DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES ${SUBDIR}/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
+MACRO(INSTALL_REL_EXE_IF_EXISTS FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.exe DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
 ENDMACRO(INSTALL_REL_EXE_IF_EXISTS)
 
+MACRO(INSTALL_REL_EXE_WITH_MAP FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.exe DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.map DESTINATION ${DEST})
+ENDMACRO(INSTALL_REL_EXE_WITH_MAP)
+
 MACRO(INSTALL_REL_EXE_WITH_MAP_IF_EXISTS FILE DEST)
-  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.exe)
-    SET(SUBDIR relwithdebinfo)
-  ELSE(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.exe)
-    SET(SUBDIR release)
-  ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.exe)
-
-  INSTALL(FILES ${SUBDIR}/${FILE}.exe DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES ${SUBDIR}/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES ${SUBDIR}/${FILE}.map DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.exe DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES RelWithDebInfo/${FILE}.map DESTINATION ${DEST} OPTIONAL)
 ENDMACRO(INSTALL_REL_EXE_WITH_MAP_IF_EXISTS)
 
-# For executabes, we rename the exe to include "-debug" suffix
+# For executables, we rename the exe to include "-debug" suffix
+MACRO(INSTALL_DBG_EXE FILE DEST)
+  INSTALL(FILES debug/${FILE}.exe DESTINATION ${DEST} RENAME ${FILE}-debug.exe)
+  INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} RENAME ${FILE}-debug.pdb)
+ENDMACRO(INSTALL_DBG_EXE)
+
 MACRO(INSTALL_DBG_EXE_IF_EXISTS FILE DEST)
   INSTALL(FILES debug/${FILE}.exe DESTINATION ${DEST} RENAME ${FILE}-debug.exe OPTIONAL)
   INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} RENAME ${FILE}-debug.pdb OPTIONAL)
 ENDMACRO(INSTALL_DBG_EXE_IF_EXISTS)
 
+MACRO(INSTALL_DBG_EXE_WITH_MAP FILE DEST)
+  INSTALL(FILES debug/${FILE}.exe DESTINATION ${DEST} RENAME ${FILE}-debug.exe)
+  INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} RENAME ${FILE}-debug.pdb)
+  INSTALL(FILES debug/${FILE}.map DESTINATION ${DEST} RENAME ${FILE}-debug.map)
+ENDMACRO(INSTALL_DBG_EXE_WITH_MAP)
+
 MACRO(INSTALL_DBG_EXE_WITH_MAP_IF_EXISTS FILE DEST)
   INSTALL(FILES debug/${FILE}.exe DESTINATION ${DEST} RENAME ${FILE}-debug.exe OPTIONAL)
   INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} RENAME ${FILE}-debug.pdb OPTIONAL)
   INSTALL(FILES debug/${FILE}.map DESTINATION ${DEST} RENAME ${FILE}-debug.map OPTIONAL)
 ENDMACRO(INSTALL_DBG_EXE_WITH_MAP_IF_EXISTS)
 
-MACRO(INSTALL_REL_LIB_IF_EXISTS FILE DEST)
-  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.lib)
-    SET(SUBDIR relwithdebinfo)
-  ELSE(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.lib)
-    SET(SUBDIR release)
-  ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/relwithdebinfo/${FILE}.lib)
-
-  INSTALL(FILES ${SUBDIR}/${FILE}.dll DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES ${SUBDIR}/${FILE}.lib DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES ${SUBDIR}/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
-  INSTALL(FILES ${SUBDIR}/${FILE}.exp DESTINATION ${DEST} OPTIONAL)
-ENDMACRO(INSTALL_REL_LIB_IF_EXISTS)
+MACRO(INSTALL_REL_LIB FILE DEST)
+  INSTALL(FILES RelWithDebInfo/${FILE}.dll DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.lib DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.pdb DESTINATION ${DEST})
+  INSTALL(FILES RelWithDebInfo/${FILE}.exp DESTINATION ${DEST})
+ENDMACRO(INSTALL_REL_LIB)
+
+MACRO(INSTALL_DBG_LIB_IF_EXISTS FILE DEST)
+  INSTALL(FILES debug/${FILE}.dll DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES debug/${FILE}.lib DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST} OPTIONAL)
+  INSTALL(FILES debug/${FILE}.exp DESTINATION ${DEST} OPTIONAL)
+ENDMACRO(INSTALL_DBG_LIB_IF_EXISTS)
+
+MACRO(INSTALL_DBG_LIB FILE DEST)
+  INSTALL(FILES debug/${FILE}.dll DESTINATION ${DEST})
+  INSTALL(FILES debug/${FILE}.lib DESTINATION ${DEST})
+  INSTALL(FILES debug/${FILE}.pdb DESTINATION ${DEST})
+  INSTALL(FILES debug/${FILE}.exp DESTINATION ${DEST})
+ENDMACRO(INSTALL_DBG_LIB)
 
 MACRO(INSTALL_DBG_LIB_IF_EXISTS FILE DEST)
   INSTALL(FILES debug/${FILE}.dll DESTINATION ${DEST} OPTIONAL)

=== modified file 'zlib/CMakeLists.txt'
--- a/zlib/CMakeLists.txt	2008-07-18 19:51:51 +0000
+++ b/zlib/CMakeLists.txt	2008-10-21 11:27:15 +0000
@@ -27,6 +27,6 @@ SET(ZLIB_SOURCES  adler32.c compress.c c
 			zutil.c zutil.h)
 IF(NOT SOURCE_SUBLIBS)
   ADD_LIBRARY(zlib ${ZLIB_SOURCES})
-  INSTALL_REL_LIB_IF_EXISTS(zlib lib/opt)
-  INSTALL_DBG_LIB_IF_EXISTS(zlib lib/debug)
+  INSTALL_REL_LIB(zlib lib/opt)
+  INSTALL_DBG_LIB(zlib lib/debug)
 ENDIF(NOT SOURCE_SUBLIBS)