List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 28 2011 1:01pm
Subject:bzr push into mysql-5.5-bugteam branch (joerg:3106 to 3107)
View as plain text  
 3107 Joerg Bruehe	2011-01-28 [merge]
      Merge for next test.

    modified:
      CMakeLists.txt
      cmake/info_macros.cmake.in
      cmake/make_dist.cmake.in
      support-files/mysql.spec.sh
 3106 Joerg Bruehe	2011-01-27 [merge]
      Next test build ...   42969

    modified:
      cmake/info_macros.cmake.in
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-01-26 19:04:50 +0000
+++ b/CMakeLists.txt	2011-01-28 11:37:49 +0000
@@ -324,7 +324,7 @@ CONFIGURE_FILE(
 INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
 # Source: This can be done during the cmake phase, all information is
 # available.
-CREATE_INFO_SRC(${CMAKE_BINARY_DIR})
+CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs)
 # Build flags: This must be postponed to the make phase.
 ADD_CUSTOM_TARGET(INFO_BIN ALL
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_bin.cmake
@@ -344,7 +344,7 @@ ADD_SUBDIRECTORY(packaging/WiX)
 SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
 
 INCLUDE(CPack)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/INFO_SRC ${CMAKE_BINARY_DIR}/INFO_BIN DESTINATION ${INSTALL_INFODIR})
+# no - Docs/  below:  INSTALL(FILES ${CMAKE_BINARY_DIR}/INFO_SRC ${CMAKE_BINARY_DIR}/INFO_BIN DESTINATION ${INSTALL_INFODIR})
 IF(UNIX)
   INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
 ENDIF()

=== modified file 'cmake/info_macros.cmake.in'
--- a/cmake/info_macros.cmake.in	2011-01-27 11:30:41 +0000
+++ b/cmake/info_macros.cmake.in	2011-01-28 12:33:43 +0000
@@ -37,33 +37,39 @@ MACRO(CREATE_INFO_SRC target_dir)
     # Sources are in a BZR repository: Always update.
     EXECUTE_PROCESS(
       COMMAND ${BZR_EXECUTABLE} version-info ${CMAKE_SOURCE_DIR}
-      WORKING_DIRECTORY ${target_dir}
-      OUTPUT_FILE ${INFO_SRC}
+      OUTPUT_VARIABLE VERSION_INFO
       RESULT_VARIABLE RESULT
     )
+    FILE(WRITE ${INFO_SRC} "${VERSION_INFO}\n")
+    FILE(APPEND ${INFO_SRC} "\nResult ${RESULT}\n")
     # For better readability ...
     FILE(APPEND ${INFO_SRC} "\nMySQL source ${VERSION}\n")
     FILE(APPEND ${INFO_SRC} "\n(1) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
   ELSEIF(EXISTS ${INFO_SRC})
     # Outside a BZR tree, there is no need to change an existing "INFO_SRC",
     # it cannot be improved.
-  ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/INFO_SRC)
+  ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
     # If we are building from a source distribution, it also contains "INFO_SRC".
-    FILE(READ ${CMAKE_SOURCE_DIR}/INFO_SRC SOURCE_INFO)
+    FILE(READ ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC SOURCE_INFO)
     FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
     FILE(APPEND ${INFO_SRC} "\n(2) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
+  ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/INFO_SRC)
+    # This is not the proper location, but who knows ...
+    FILE(READ ${CMAKE_SOURCE_DIR}/INFO_SRC SOURCE_INFO)
+    FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
+    FILE(APPEND ${INFO_SRC} "\n(3) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
   ELSEIF(EXISTS ./INFO_SRC)
     # This is a special rule for our release build environment,
     # where we already exported from a BZR tree and added "bzr version-info".
     FILE(READ ./INFO_SRC SOURCE_INFO)
     FILE(WRITE ${INFO_SRC} "${SOURCE_INFO}\n")
-    FILE(APPEND ${INFO_SRC} "\n(3) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
+    FILE(APPEND ${INFO_SRC} "\n(4) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
   ELSE()
     # This is a fall-back.
     FILE(WRITE ${INFO_SRC} "\nMySQL source ${VERSION}\n")
     EXECUTE_PROCESS(COMMAND pwd OUTPUT_VARIABLE CURRENT_DIR)
     FILE(APPEND ${INFO_SRC} "Current dir ${CURRENT_DIR}\n")
-    FILE(APPEND ${INFO_SRC} "\n(4) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
+    FILE(APPEND ${INFO_SRC} "\n(5) Source ${CMAKE_SOURCE_DIR} - Binaries ${CMAKE_BINARY_DIR} - Target ${target_dir}\n")
   ENDIF()
 ENDMACRO(CREATE_INFO_SRC)
 
@@ -72,7 +78,7 @@ ENDMACRO(CREATE_INFO_SRC)
 # to make sure we report the current flags (not those of some previous run).
 
 MACRO(CREATE_INFO_BIN)
-  SET(INFO_BIN "INFO_BIN")
+  SET(INFO_BIN "Docs/INFO_BIN")
 
   FILE(WRITE ${INFO_BIN} "===== Information about the build process: =====\n")
   IF (WIN32)
@@ -89,12 +95,14 @@ MACRO(CREATE_INFO_BIN)
   # According to the cmake docs, this variable should always be set.
   # However, it is empty in my local tests, cmake 2.6.0 on Linux (Debian stable, Jan 2011).
   # Include this code, so we will profit if a build environment does provide that info.
-  IF(${CMAKE_HOST_SYSTEM})
-    IF(${CMAKE_CROSSCOMPILING})
+# IF(${CMAKE_HOST_SYSTEM})
+#   IF(${CMAKE_CROSSCOMPILING})
       FILE(APPEND ${INFO_BIN} "Build was done for ${CMAKE_SYSTEM} using ${CMAKE_SYSTEM_PROCESSOR}\n")
-    ENDIF()
+#   ENDIF()
     FILE(APPEND ${INFO_BIN} "Build was done on  ${CMAKE_HOST_SYSTEM} using ${CMAKE_HOST_SYSTEM_PROCESSOR}\n\n")
-  ENDIF()
+# ENDIF()
+
+  FILE(APPEND ${INFO_BIN} "Build was done using cmake ${CMAKE_VERSION} : ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} \n\n")
 
   IF (WIN32)
     FILE(APPEND ${INFO_BIN} "===== Compiler / generator used: =====\n")

=== modified file 'cmake/make_dist.cmake.in'
--- a/cmake/make_dist.cmake.in	2011-01-25 20:45:04 +0000
+++ b/cmake/make_dist.cmake.in	2011-01-28 12:47:33 +0000
@@ -109,7 +109,7 @@ ENDIF()
 # Ensure there is a "INFO_SRC" file.
 INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
 IF(NOT EXISTS ${PACKAGE_DIR}/INFO_SRC)
-  CREATE_INFO_SRC(${PACKAGE_DIR})
+  CREATE_INFO_SRC(${PACKAGE_DIR}/Docs)
 ENDIF()
 
 # In case we used CPack, it could have copied some

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-01-25 15:45:18 +0000
+++ b/support-files/mysql.spec.sh	2011-01-28 11:37:49 +0000
@@ -506,9 +506,9 @@ touch $RBR%{_sysconfdir}/my.cnf
 install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
   $RBR%{_datadir}/mysql/SELinux/RHEL4
 
-# Install INFO_* (info about source and binaries) files in infodir
-install -m 644 $MBD/%{src_dir}/INFO_SRC $RBR%{_infodir}
-install -m 644 $MBD/release/INFO_BIN $RBR%{_infodir}
+# ?  # Install INFO_* (info about source and binaries) files in infodir
+# ?  install -m 644 $MBD/%{src_dir}/Docs/INFO_SRC $RBR%{_infodir}
+# ?  install -m 644 $MBD/release/INFO_BIN $RBR%{_infodir}
 
 %if %{WITH_TCMALLOC}
 # Even though this is a shared library, put it under /usr/lib*/mysql, so it
@@ -912,11 +912,11 @@ echo "====="                            
 %doc %{license_files_server}
 %endif
 %doc %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
 %doc release/support-files/my-*.cnf
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
-%doc %attr(644, root, root) %{_infodir}/INFO_SRC*
-%doc %attr(644, root, root) %{_infodir}/INFO_BIN*
 
 %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
 %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
@@ -1091,10 +1091,9 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
-* Tue Jan 25 2011 Joerg Bruehe <joerg.bruehe@stripped>
+* Fri Jan 28 2011 Joerg Bruehe <joerg.bruehe@stripped>
 
-- Install the new "manifest" files:
-  "INFO_SRC" and "INFO_BIN" in the "info" directory.
+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
 
 * Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@stripped>
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-bugteam branch (joerg:3106 to 3107) Joerg Bruehe28 Jan