From: Tor Didriksen
Date: November 24 2010 2:03pm
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3138) Bug#58372
List-Archive: http://lists.mysql.com/commits/124878
X-Bug: 58372
Message-Id: <20101124140357.0BBBE37A3@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4167893976500320902=="

--===============4167893976500320902==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/5.5-bugteam-bug58372-cmake/ based on revid:magnus.blaudd@stripped

 3138 Tor Didriksen	2010-11-23
      Bug #58372 cmake should not write temporary files in the source directory
     @ cmake/do_abi_check.cmake
        Put temporary files in ${BINARY_DIR} rather than in source directory.
        Slight reformatting for readability of commands.

    modified:
      cmake/do_abi_check.cmake
=== modified file 'cmake/do_abi_check.cmake'
--- a/cmake/do_abi_check.cmake	2010-08-27 06:45:35 +0000
+++ b/cmake/do_abi_check.cmake	2010-11-23 09:26:26 +0000
@@ -53,23 +53,27 @@
 SET(abi_check_out ${BINARY_DIR}/abi_check.out)
 
 FOREACH(file ${ABI_HEADERS})
-  SET(tmpfile ${file}.pp.tmp)
-    EXECUTE_PROCESS(
-     COMMAND ${COMPILER} 
-       -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include
-       -I${BINARY_DIR}/include -I${SOURCE_DIR}/include/mysql -I${SOURCE_DIR}/sql
-       ${file} 
-       ERROR_QUIET OUTPUT_FILE ${tmpfile})
-    EXECUTE_PROCESS(
-      COMMAND sed -e 
-      "/^# /d" -e "/^[	]*$/d"  -e "/^#pragma GCC set_debug_pwd/d" -e "/^#ident/d"
-      RESULT_VARIABLE result OUTPUT_FILE ${abi_check_out} INPUT_FILE ${tmpfile})
+  GET_FILENAME_COMPONENT(header_basename ${file} NAME)
+  SET(tmpfile ${BINARY_DIR}/${header_basename}.pp.tmp)
+
+  EXECUTE_PROCESS(
+    COMMAND ${COMPILER} 
+      -E -nostdinc -dI -DMYSQL_ABI_CHECK -I${SOURCE_DIR}/include
+      -I${BINARY_DIR}/include -I${SOURCE_DIR}/include/mysql -I${SOURCE_DIR}/sql
+      ${file} 
+      ERROR_QUIET OUTPUT_FILE ${tmpfile})
+  EXECUTE_PROCESS(
+    COMMAND sed -e "/^# /d"
+                -e "/^[	]*$/d"
+                -e "/^#pragma GCC set_debug_pwd/d"
+                -e "/^#ident/d"
+    RESULT_VARIABLE result OUTPUT_FILE ${abi_check_out} INPUT_FILE ${tmpfile})
   IF(NOT ${result} EQUAL 0)
     MESSAGE(FATAL_ERROR "sed returned error ${result}")
   ENDIF()
   FILE(REMOVE ${tmpfile})
-  EXECUTE_PROCESS(COMMAND diff -w ${file}.pp ${abi_check_out} RESULT_VARIABLE
-     result)
+  EXECUTE_PROCESS(
+    COMMAND diff -w ${file}.pp ${abi_check_out} RESULT_VARIABLE result)
   IF(NOT ${result} EQUAL 0)
     MESSAGE(FATAL_ERROR 
       "ABI check found difference between ${file}.pp and ${abi_check_out}")


--===============4167893976500320902==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   alplf2qce569a5br
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58372-\
#   cmake/
# testament_sha1: 90d9b59499d0f5915ca8aad17430b704d619f3bf
# timestamp: 2010-11-24 15:03:56 +0100
# base_revision_id: magnus.blaudd@stripped\
#   uq1bftwnwj6xxldd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfXi3EQAAhhfgFA0XHP/93/v
/2u////6UAUjXiXDuW3VrroaDsJJCmKbBAnhJkgwjINNGmg2hpG01MDUyaDKaU9CeTTJpkqep+pp
6oDCMjQNAZAYQaYmgMiAoMmUaeo08oPUAaAyNAAAAABxoyZGEYgGE0GATQaBkyaMmQwgMJJBNNCn
hT0ATGpppT9SepptqT1NBoAAAB6mAIgPrNiyjjTX2EmPAr3VNnZ6v7E0rWbBK9z4kHjHffI7LHB8
qR5jIE8AnDp7Hb/u7X+LyXh+dyrR1R6bdu5vMMxT1mqFA1cBycNa6L01r+NaXehz5KbMSymPudqr
pdU+F5ki3MkNFvikFp6uEGtsgYa4T0Rw3QMRYhHmxBhUVohY4GOJjpWRzbtmFrKOvuDCHgkXZxl6
xPqdVA41joi1pBVJ+/qT+D9lNMFkiuaTJtoGJmaveF2/44Spkmadz4h0Zc2bOF7JDgTvQdfG0pkX
/LMM6PJKIdAgvd6j+KCUX9AvI0uVckiu6YeJd6sAkImsY0SESq7HTlk5ocEjJ8mW7HyTsSFHFlnI
Ka2vUtoNeayInZklGZAswzJTh93K+ynrSeltRTDKLAwY7WIbNetspYQgBIopgBAN2NkIddmiZjAK
iXUbXP0wcYMVh2X69jGqMgsWG1klov14iWhFCStmrOFdFXRM3Ar1Ndw8L8HiYNj8JtREmT8AJOgd
LCXRGMoXUBrm0rHc6jlpFepICYfc1jxYL6n1XIYjSM6UcpxSolRdFwrhLC8XWwUHPeBtUQmyAkmE
b9m18wrAFmqW8Au4i+Va00I1a6NW4+dHh5aGB6lqvgrBECKuWAzBPHXmoRKErwTtAMlxavoaTSu8
cpaWZhvNaFx7ebT2LvVEW8tZ71MnC4be1OYv3u3UoSZnXlQa/PgnU0S51SEB9l4Lpq7w8PkpOoS2
LhUIID5lNQpIjYvRLi5WSG0RbXHMRZE5xqEqe2Y67IBxc9ZgkAWmvWethGaoqeAFZCNGi0zKhEyE
ixYFp8NwJ8UeAZmKwZSOOdHKcyW/uM3tYOQzaM8R7/seHTyF7PNtiOR6fn6wL6xl7T2teRRcCzeI
pZ1jjHHyToeSqA97jMukOGOr81DuUtz5/Kk6MWQcdEi0BQB96ijybZNtnxIyKgyjm2GX4CxsryxS
wuQ9hwEF7ZAfbCCyDoXWBnwAY4DHw1axjS8ZcgkXtKMORlM9oyTKBoaiKzgZ+473GrS2p1KC1vCu
4Lu9/aP8OdrkPpQAK9b6wpYyloNIbQI1X5V0xKsgiBozFyysJUTS8Z8uF3Gpvc217GnU2n+nF5ck
UVt/yZYP0UOKMs5u1KZFgvhIoRIazLjgKN77b1UZMp/Ku1vUvgXBsY9Qu+xO3YsW4MizS7OyjeGF
QZ3aAcWf5fFKEcsQeYTS0nXz5Mv0+3cBCblpfSg2oVVBrCXNcgunRm3aI5gmdoW5Xxb3l260smN6
DUD0HpNoTCbg0rhh5qlVgMI7hcPpfbnm4TFlKvSIawdOxRQY5gkQKx0JC8xwUzimAVyh8gCWkcAE
SpHPQlGqZA5wLEL05aVuNiLpU7MBKkOVB5TwA8wGDUPBnI7jDnuOBRrZvX6sdrMECbLsExLodnOV
b1UKw4le9t7xwDOQ4FW9xbSNVqHRpQ4hk48aureg4WBphbRArGBxK1SuIUV80Di17GVj8AdNVwOP
w1q2oHG4HFmvbhJ/YRpd3mJg7lcYMTm4Yq7bSjd6PAzHrGoPC8G5IKUHKMrtopQcGTDM+rwGml5O
ZWLTxoEOwAxjQGAVuN45dRccRugOQ4ANezQNaPuSeFbCIqgIR/i7kinChIevFuIg


--===============4167893976500320902==--