List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 26 2011 5:10pm
Subject:bzr push into mysql-5.5-bugteam branch (joerg:3102 to 3103)
View as plain text  
 3103 Joerg Bruehe	2011-01-26 [merge]
      Merge next 42969 step to "itch" for testing.

    added:
      cmake/info_bin.cmake
    modified:
      CMakeLists.txt
      cmake/info_macros.cmake.in
 3102 Joerg Bruehe	2011-01-26 [merge]
      Merge fixes for next test build.

    modified:
      cmake/info_macros.cmake.in
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2011-01-25 20:45:04 +0000
+++ b/CMakeLists.txt	2011-01-26 17:08:56 +0000
@@ -327,7 +327,7 @@ INCLUDE(${CMAKE_BINARY_DIR}/info_macros.
 CREATE_INFO_SRC(${CMAKE_BINARY_DIR})
 # Build flags: This must be postponed to the make phase.
 ADD_CUSTOM_TARGET(INFO_BIN ALL
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/info_macros.cmake
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_bin.cmake
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 

=== added file 'cmake/info_bin.cmake'
--- a/cmake/info_bin.cmake	1970-01-01 00:00:00 +0000
+++ b/cmake/info_bin.cmake	2011-01-26 17:08:56 +0000
@@ -0,0 +1,30 @@
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+# The sole purpose of this cmake control file is to create the "INFO_BIN" file.
+
+# By having a separate cmake file for this, it is ensured this happens
+# only in the build (Unix: "make") phase, not when cmake runs.
+# This, in turn, avoids creating stuff in the source directory -
+# it should get into the binary directory only.
+
+
+# Get the macros which the "INFO_*" files.
+INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
+
+# Here is where the action is.
+CREATE_INFO_BIN()
+

=== modified file 'cmake/info_macros.cmake.in'
--- a/cmake/info_macros.cmake.in	2011-01-26 08:53:07 +0000
+++ b/cmake/info_macros.cmake.in	2011-01-26 17:08:56 +0000
@@ -44,9 +44,9 @@ MACRO(CREATE_INFO_SRC target_dir)
     # 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)
+  ELSEIF(EXISTS ../../INFO_SRC)
     # The following is a special rule for our build environment, where we already exported from a BZR tree.
-    FILE(READ ../INFO_SRC SOURCE_INFO)
+    FILE(READ ../../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(NOT EXISTS ${target_dir}/INFO_SRC)
@@ -111,4 +111,3 @@ MACRO(CREATE_INFO_BIN)
 
 ENDMACRO(CREATE_INFO_BIN)
 
-CREATE_INFO_BIN()

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-bugteam branch (joerg:3102 to 3103) Joerg Bruehe26 Jan