List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 31 2011 9:15pm
Subject:bzr push into mysql-5.5-bugteam branch (joerg:3209 to 3210)
View as plain text  
 3210 Joerg Bruehe	2011-01-31
      Buf#42969  Please add a MANIFEST to each build
      
      Additional fixes to get some missing information logged.

    modified:
      cmake/info_macros.cmake.in
 3209 Joerg Bruehe	2011-01-31
      Fix bug#42969    Please add a MANIFEST to each build
      
      With this change, there will be new files "INFO_SRC"
      and "INFO_BIN", which describe the source and the
      binaries.
      They will be contained in all packages:
      - in "tar.gz" and derived packages, in "docs/",
      - in RPMs, in "/usr/share/doc/packages/MySQL-server".
      
      "INFO_SRC" is also part of a source tarball.
      It gives the version as exact as possible, preferably
      by calling "bzr version-info" on the source tree.
      If that is not possible, it just contains the three
      level version number.
      
      "INFO_BIN" contains some info when and where the
      binaries were built, the options given to the compiler,
      and the flags controlling the included features.
      
      (At the time of this writing, January 2011,
      cmake 2.6.4 does not provide some of this desired
      information in the extent promised by its documentation.)
     @ CMakeLists.txt
        For the new files describing the source and the build
        ("INFO_SRC" and "INFO_BIN"), we need a new file
        "cmake/info_macros.cmake.in" with the build rules.
        
        1) This file must be configured with the current variables.
        
        2) "INFO_SRC" can be created during the cmake phase.
        
        3) "INFO_BIN" must be created during the make phase
           only, because it contains information from files
        which will be written at the end of the cmake phase only.
        Therefore, it must be a custom target which is included
        in all "make" targets.
        
        4) The resulting version files must be included in packages.
     @ cmake/info_bin.cmake
        This is the file to create "INFO_BIN",
        by calling the "CREATE_INFO_BIN()" macro.
        
        It must be a separate file, so that the macro
        definitions can be included in other cmake scripts
        without that file inclusion causing a side effect,
        the macro call.
        That call would modify the source tree which should
        be trated read-only.
     @ cmake/info_macros.cmake.in
        This new file contains the macros to create the
        "INFO_*" files during various steps of the build,
        the calls will be at other places.
        
        1) For source: If running from a BZR tree, always create
           (update) "INFO_SRC" by running "bzr version-info".
           Outside a BZR tree, try to take it from exported
           sources, and create it only if missing, in that
           case put the three level version number into it.
        
        2) "INFO_BIN" contains (if provided)
           - date/time and host name of the build host,
           - information about the platform,
             (2.6.4 does not provide it, the manual is wrong),
           - information about the C and CXX compiler
             and the options given to them (Unix only),
           - the feature flags as reported by "cmake -L".
     @ cmake/make_dist.cmake.in
        Create a "VERSION_src" file during "make dist".
        
        In case it already exists from a preceding "cmake" run
        or tree export (which is quite likely), a new
        "make dist" must not modify it.
     @ support-files/mysql.spec.sh
        Add "INFO_SRC" and "INFO_BIN" to the RPM contents.

    added:
      cmake/info_bin.cmake
      cmake/info_macros.cmake.in
    modified:
      CMakeLists.txt
      cmake/make_dist.cmake.in
      support-files/mysql.spec.sh
=== modified file 'cmake/info_macros.cmake.in'
--- a/cmake/info_macros.cmake.in	2011-01-31 19:32:10 +0000
+++ b/cmake/info_macros.cmake.in	2011-01-31 21:14:38 +0000
@@ -20,6 +20,8 @@
 SET(VERSION "@VERSION@")
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
+SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+SET(CMAKE_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")
 SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
  
  
@@ -70,9 +72,9 @@ MACRO(CREATE_INFO_BIN)
 
   FILE(WRITE ${INFO_BIN} "===== Information about the build process: =====\n")
   IF (WIN32)
-    EXECUTE_PROCESS(COMMAND date /c /T OUTPUT_VARIABLE TMP_DATE)
+    EXECUTE_PROCESS(COMMAND cmd /c date /T OUTPUT_VARIABLE TMP_DATE)
   ELSEIF(UNIX)
-    EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE)
+    EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSE()
     SET(TMP_DATE "No date command known")
   ENDIF()
@@ -104,6 +106,7 @@ MACRO(CREATE_INFO_BIN)
       FILE(APPEND ${INFO_BIN} "File 'sql/CMakeFiles/sql.dir/flags.make' is not yet found.\n\n")
     ENDIF()
   ENDIF()
+  FILE(APPEND ${INFO_BIN} "Pointer size: ${CMAKE_SIZEOF_VOID_P}\n\n")
 
   FILE(APPEND ${INFO_BIN} "===== Feature flags used: =====\n")
   IF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-bugteam branch (joerg:3209 to 3210) Joerg Bruehe31 Jan