From: Tor Didriksen
Date: November 23 2010 9:26am
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3135) Bug#58372
List-Archive: http://lists.mysql.com/commits/124710
X-Bug: 58372
Message-Id: <20101123092630.E558B37A3@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0771411139861443045=="

--===============0771411139861443045==
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:davi.arnaut@stripped

 3135 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}")


--===============0771411139861443045==
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\
#   l2blyh8r7e8ql2ii
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58372-\
#   cmake/
# testament_sha1: 825570e7df39ac85b29aea0b7a57fd0f52597f20
# timestamp: 2010-11-23 10:26:30 +0100
# base_revision_id: davi.arnaut@stripped\
#   gz32oyo0apku4leb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcp6hXIAAgnfgHA0XHP/93/v
/2u////6UAUene3Pdse8btG3XeqqusJIkCBkSPBPSMnqm1NpNqA0HqaNHqeobU9Q9T00jQZQmjTI
npoJMmTJoAAA0AAAAADQSaGgE1PRGj1D1D0gANA0NAAAABFJKeTT0ITJpN6ap+qZqAAGmgAAAAAC
SRMlPAmnqanpNqYUyaGmmgaaAGjRoaAGgzBOHMweW3DYOOnR7yjVepfGuxnqWmuptGk1vc+KDqn4
ITPjiiisJHeMgUAC0H3/L9Gf9Q7oFv1dMd7s1y/jD44+hhmKMZ2xTjYIh042B5N19bGwlfU8JqMH
hXEcO1+2/Q95WTrIk14MEeKQRNR4PsY4DDnv0Xb2CoDhJTIeamMKCyIYO3B3oPc4yjo36ovzfP7B
qD8CTuIZa9dB4HruzNVWyiLE2RuR6ZZKVUixXEY0rpeazkCjJoisVpUzV6IRh4GXCzYBcwhwjtkn
LgtNqJd6Iht6mDxCiGIQVhyqmJPDwBcTMq4CK6FOHfLcLgnQZKVmjPtIGyJhHzyxbJVC83knQJAw
72CYRF1eIC7W6K68ToQCfcXgb92hzNcDQGGa8bx203Pcr3oC03xvySHS5IDOrEhhR/VECIarHvjH
cpoV9sdUjTVTjtJyzNqkGbDJiJDb7BXXAqXjuB7fsqjElScMtkLSnW6TYlkuPG0UVVxpSmsHlAyX
zBZWDLWLj42xQkgs2OYFxYlRB4cGsW0ODQxsbkmycSNGG8C11EEsEEEXBaFNCC+WiJIkdaJywY1Y
CEgpiphiccI1wISDlSk0nSBVMpUibIbwUIH0UHlZyYJHleXEWpuee4zczVem5Io0t+/1mw2LcOrN
DMw3eta91XXs/a3KeTmVaEFZTi6cO1Oxct7d6im63tqcu6eC0rMi0qgIiHHbCub9wdudTaxPWoTj
EpvnWIpRNLdYVlaVTlxEyaiwNEDTbRfjioN9jw4unUXpeC0yaV1QRra5rAGxLtukrV6YuUjaV8l0
/rshZfPIZmL4MpnPoj2mlLNlZszBoOrs0SHlcPhp1YEVHk1WxHVk9AypVpBFiCUJK66MaFz1o51A
rIkz3FCtXQHe9ZlKOf1OH7Z6ecy80dtM3QF4FYu95YNLkRmLAsq14E3Rko0ySutQ9hwiZcu6HslJ
4KZ84e/jDDOYb3uxMlAvDspKZpSpZhI8oFhrWo1E1YhmpFuxDUsAEyNLIwPC54ochDNlodEEho3z
VcLvy0lMWA+soq/PRcy0M85XC2gmsK5cYRPCxkFtiS6N0zgv324Dd7pOJAQgmP9IynWprklXgLV5
ViNgzBMopENfx8cuK7c4pS0p+6qluVZyMakepqW4ZmLJMirO6bgWsNUgz8Yn4g8s/WWCU0OvaXhB
wsUmq1bze6u7D8fVtXcnOh4OYNMwMUbchgFfEuyEqI59miGcKDALd/LBt/FK9jYg3AeBvL+mkNQy
GYT3H+c3TlbRIe0wvF55Z9dbZW8sdIlWgJUwQZrwiWlY6ac0PgOWU3Zx0HEbWJkmbS1KhFlimTcV
VDRDDjzmMEy1YaEcgdCk5K9C/0SAxHgzkdgu4tZ1jgU+hm2SxZgeUMtxMR5DHtT1VnEKc4whYaBg
kLPhkXWEcBFaQWbZHHO7EDksDKs8LZ4EBgcTxuH09sCcsexvVPyA6hUzG/v1KykEFaCPSzKn1rDz
CgX+FIoS2YUGHOQGItCUNr1tgZA3wceO4OGQzFTKVrXm6tGZePeV/asBxzVJxWnLEIbHhQHFsk7o
bIeMM42PSxZ6zqT+6vhlbESkEJ/xdyRThQkMp6hXIA==


--===============0771411139861443045==--