From: Tor Didriksen
Date: November 24 2010 12:51pm
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3137) Bug#58372
List-Archive: http://lists.mysql.com/commits/124863
X-Bug: 58372
Message-Id: <20101124125107.E8FF837A3@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3005114000139982590=="

--===============3005114000139982590==
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:alexander.nozdrin@stripped

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


--===============3005114000139982590==
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\
#   c8792p99gn917ub9
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-bug58372-\
#   cmake/
# testament_sha1: 1f08076303d451c4e254350229b8f5fc326254f8
# timestamp: 2010-11-24 13:51:07 +0100
# base_revision_id: alexander.nozdrin@stripped\
#   bnq1dn1gfbepmwio
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRrocLEAAiXfgFA0XHP/93/v
/2u////6UAUjV63t47S3cbx66y9aYSSIE00yaT1NoRtUZDRtJoyYQ09J6I2mgaamj1BlBA0npk0m
SPU9QAAAGgNAAAABJECAmSm1PRiT0yQaAyNADIAAAASSUTeimyjxNQ9TZEDIAGgA0aAAAASRKaaY
U9TwKnmgjEyTymg0yAGgAAA0vBEBzTVYxxor2iSKlUZ7eZnq7imttXiW298SD0juPkdjsglmSNYy
BPAJw/fe7fyeD/R5LxccNfZnj7cXuhyMMxR3GqCcauAcnDYnReda7mwkvW58lGCpWGLydqrodffB
dfe+G6RLvJeWzeRSMbA4uGmXPHbmDwqDI+cGOVzazJj5scrHYttzb2C82Cfv8g2A80iW4MuBPv+w
VcJzrFRFLRFtIcD7H1UptRZUka0jMdFreAMnB447K6JmswhIO6y3NB7gpd0hhLePmsJ6CWItq8so
QR0pRBmDgUkxdInHkDEjF1Y/Owi2xVByGTjxCgixbkp0EWouGiOaL5J21ai6JmKpCcXJZGaYVNg3
Q1KXZsU+GMoZklVEXAlLeSlIFC5KylupPS0nxkL8pguFFLQiqtBugYl1cQIhrrvgotmq3qzCLTuN
96Xb006y2rpa6CUwx7ECZIWmmZKuGoNWlApRlxtbIxGCnAlFczBkYcLqGh1EJkpTAnmAbLWXiIlk
4shCKSQ0CILalgoEzJBFUJRO0GeO8k50drjOMm21l8GgIepS5SZli9DADUFMe9JBRZMXGVM4bgtq
09K0Konv4xRUTjQzZAqFbRPQ7QzxcLIQzNhPBpEByjqDyo8CoKPJ6Gsxq6+Odmqbc4qYEjVq5DQa
FpHKiZmZjWs65/Vl0eC0qeLgVp71MnC48PinMU0eOpQSZXXVObOa9cU0SzKgIB+O6Epq0h58qq+A
nrwTjFD85FvmpFVeipSUnherUXPuKosMq6FiLo1vN0rhOZ2qLkuBYZLj9REZSHoaAEWh9bBeN8sS
KYgU8y8fi+Ec75hmYzAZQOMSOUxJa99m1WDnOnP+IjhcHT9dbYEbpkzfmlI5bvQMsplpIkXUG8r8
d9VVR61J1UIgLigHvcZw472YrWHp/wrZTiISfqlXV2hABN91gaVq+VFhYEkIr2Os2LL1vHUlLOh7
DkiBc2cDrg5RBWqQDu2gLKBXn3w4XBxmjL1RFyjUYLiKzSBVpORzIrrGueVBtUz7s1IV8kPeQ39m
l0QvZIfC9O+bLthDXn1mDKRzabq32FT8JIHJYonrgk5Zbit00armyWS37JdjZf25WUpGKtutMo1Z
gDJG5HrxlN6lImDhCSqUnQ2jM09MNGXGOlUL5sZP7t1N012yQ2kgo3txRYz2MjjU98MYsPEFNoZO
aGUIFH9riSwRY7ggWSpZS3f3mXf1+sCCuV6w/CGVBYhTRm2ECk317wptR3/Xgh+KrCU5Qn21xNtz
JXMakF4QQfUzhY8gSYA1VRqVIZFiZGvneG5RV0WnBInkB7JIMcoTLy4eNDdhIdYHWWmohNymDZ1e
J5pSTO2poUZJgi6wJcaqUYomTLQSoqgo8V9glgDlwnRJYB1pDBaQBnIvEuxUXSurFtmwXhWqmYK5
jsstMPoKdN8USjN2znadgGFBh0lNnconGmyDyIYhpc55aOIFsmDHHJOJaMDlJ4kJWcSBy+DGy2GA
PWrInD2bVfYDmhyfZoujhkIsT9JYVPt4SpiSRxiXXQYdG/mLToGwnNSG6sZiZlXQ1pzivsXTrVu7
gBz0MTrKGDjoCAatRU1hTBSywBJYgiU5rQ+6S4nWWZzgZH+LuSKcKEgNdDhYgA==


--===============3005114000139982590==--