bzr push into mysql-5.5-bugteam branch (build:3132 to 3133)

[MySQL Build Team]

 3133 MySQL Build Team	2010-12-09
      Making this change to test 51264

    modified:
      support-files/CMakeLists.txt
 3132 Davi Arnaut	2010-11-20
      WL#5665: Removal of the autotools-based build system
      
      The autotools-based build system has been superseded and
      is being removed in order to ease the maintenance burden on
      developers tweaking and maintaining the build system.
      
      In order to support tools that need to extract the server
      version, a new file that (only) contains the server version,
      called VERSION, is introduced. The file contents are human
      and machine-readable. The format is:
      
      MYSQL_VERSION_MAJOR=5
      MYSQL_VERSION_MINOR=5
      MYSQL_VERSION_PATCH=7
      MYSQL_VERSION_EXTRA=-rc
      
      The CMake based version extraction in cmake/mysql_version.cmake
      is changed to extract the version from this file. The configure
      to CMake wrapper is retained for backwards compatibility and to
      support the BUILD/ scripts. Also, a new a makefile target
      show-dist-name that prints the server version is introduced.
     @ VERSION
        Add top-level version file.
     @ cmake/mysql_version.cmake
        Get version information from the top-level VERSION file.
        Do not cache the version components (MAJOR_VERSION, etc).
        Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.

    removed:
      BUILD/Makefile.am
      Docs/Makefile.am
      Makefile.am
      client/Makefile.am
      cmake/Makefile.am
      cmd-line-utils/Makefile.am
      cmd-line-utils/libedit/Makefile.am
      cmd-line-utils/readline/Makefile.am
      config/
      config/ac-macros/
      config/ac-macros/alloca.m4
      config/ac-macros/character_sets.m4
      config/ac-macros/check_cpu.m4
      config/ac-macros/compiler_flag.m4
      config/ac-macros/dtrace.m4
      config/ac-macros/large_file.m4
      config/ac-macros/maintainer.m4
      config/ac-macros/misc.m4
      config/ac-macros/plugins.m4
      config/ac-macros/readline.m4
      config/ac-macros/ssl.m4
      config/ac-macros/zlib.m4
      configure.in
      dbug/Makefile.am
      extra/Makefile.am
      extra/yassl/Makefile.am
      extra/yassl/src/Makefile.am
      extra/yassl/taocrypt/Makefile.am
      extra/yassl/taocrypt/benchmark/Makefile.am
      extra/yassl/taocrypt/src/Makefile.am
      extra/yassl/taocrypt/test/Makefile.am
      extra/yassl/testsuite/Makefile.am
      include/Makefile.am
      libmysql/Makefile.am
      libmysql/Makefile.shared
      libmysql/acinclude.m4
      libmysql_r/Makefile.am
      libmysqld/Makefile.am
      libmysqld/examples/Makefile.am
      libservices/Makefile.am
      man/Makefile.am
      mysql-test/Makefile.am
      mysql-test/lib/My/SafeProcess/Makefile.am
      mysys/Makefile.am
      packaging/Makefile.am
      plugin/Makefile.am
      plugin/audit_null/Makefile.am
      plugin/audit_null/plug.in
      plugin/auth/Makefile.am
      plugin/auth/plug.in
      plugin/daemon_example/Makefile.am
      plugin/daemon_example/configure.in
      plugin/daemon_example/plug.in
      plugin/fulltext/Makefile.am
      plugin/fulltext/configure.in
      plugin/fulltext/plug.in
      plugin/semisync/Makefile.am
      plugin/semisync/configure.in
      plugin/semisync/plug.in
      regex/Makefile.am
      scripts/Makefile.am
      sql-bench/Makefile.am
      sql-common/Makefile.am
      sql/Makefile.am
      sql/share/Makefile.am
      storage/Makefile.am
      storage/archive/Makefile.am
      storage/archive/plug.in
      storage/blackhole/Makefile.am
      storage/blackhole/plug.in
      storage/csv/Makefile.am
      storage/csv/plug.in
      storage/example/Makefile.am
      storage/example/plug.in
      storage/federated/Makefile.am
      storage/federated/plug.in
      storage/heap/Makefile.am
      storage/heap/plug.in
      storage/innobase/Makefile.am
      storage/innobase/plug.in
      storage/myisam/Makefile.am
      storage/myisam/plug.in
      storage/myisammrg/Makefile.am
      storage/myisammrg/plug.in
      storage/perfschema/Makefile.am
      storage/perfschema/plug.in
      storage/perfschema/unittest/Makefile.am
      strings/Makefile.am
      support-files/MacOSX/Makefile.am
      support-files/Makefile.am
      support-files/RHEL4-SElinux/Makefile.am
      tests/Makefile.am
      unittest/Makefile.am
      unittest/examples/Makefile.am
      unittest/mysys/Makefile.am
      unittest/mytap/Makefile.am
      unittest/mytap/t/Makefile.am
      unittest/strings/Makefile.am
      vio/Makefile.am
      win/Makefile.am
      zlib/Makefile.am
    added:
      VERSION
    modified:
      BUILD/FINISH.sh
      BUILD/autorun.sh
      BUILD/cmake_configure.sh
      cmake/make_dist.cmake.in
      cmake/mysql_version.cmake
      cmake/versioninfo.rc.in
      packaging/WiX/create_msi.cmake.in
      packaging/WiX/mysql_server.wxs.in
      sql/CMakeLists.txt
      support-files/MySQL-shared-compat.spec.sh
      support-files/mysql.spec.sh
=== modified file 'support-files/CMakeLists.txt'
--- a/support-files/CMakeLists.txt	2010-11-19 13:56:08 +0000
+++ b/support-files/CMakeLists.txt	2010-12-08 23:51:50 +0000
@@ -48,13 +48,6 @@ FOREACH(inifile my-huge my-innodb-heavy-
 ENDFOREACH()
 
 IF(UNIX)
-  # XXX: again, used elsewhere (scripts/), should be standardised in
-  # XXX: install_layout.cmake
-  IF(INSTALL_LAYOUT MATCHES "STANDALONE")
-    SET(prefix ".")
-  ELSE()
-    SET(prefix ${CMAKE_INSTALL_PREFIX})
-  ENDIF()
  
   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)


Attachment: [text/bzr-bundle] bzr/[e-mail]