From: Tor Didriksen
Date: June 9 2011 2:50pm
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3435) Bug#12641810
List-Archive: http://lists.mysql.com/commits/138972
X-Bug: 12641810
Message-Id: <20110609145039.25BC42AA@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2131791425542170478=="

--===============2131791425542170478==
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-test_tp/ based on revid:dmitry.lenev@stripped

 3435 Tor Didriksen	2011-06-09
      Bug#12641810 - MYSQL MAKE DIST DOESN'T WORK WHEN USING MYSQL TREE + PLUGIN TREE(S)
     @ cmake/make_dist.cmake.in
        Run 'bzr export' for plugins.
     @ cmake/plugin.cmake
        Lookup plugins with bzr repos.

    modified:
      cmake/make_dist.cmake.in
      cmake/plugin.cmake
=== modified file 'cmake/make_dist.cmake.in'
--- a/cmake/make_dist.cmake.in	2011-03-03 21:46:12 +0000
+++ b/cmake/make_dist.cmake.in	2011-06-09 14:50:30 +0000
@@ -28,6 +28,7 @@ SET(TAR_EXECUTABLE "@TAR_EXECUTABLE@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_MAKE_PROGRAM "@CMAKE_MAKE_PROGRAM@")
 SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
+SET(PLUGIN_REPOS "@PLUGIN_REPOS@")
 
 SET(VERSION "@VERSION@")
 
@@ -53,6 +54,22 @@ IF(BZR_EXECUTABLE)
   ENDIF()
 ENDIF()
 
+IF(BZR_EXECUTABLE)
+  FOREACH(REPO ${PLUGIN_REPOS})
+    GET_FILENAME_COMPONENT(PLUGIN_NAME ${REPO} NAME)
+    SET(DEST ${PACKAGE_DIR}/plugin/${PLUGIN_NAME})
+    MESSAGE(STATUS "Running bzr export for plugin/${PLUGIN_NAME}")
+    EXECUTE_PROCESS(
+      COMMAND "${BZR_EXECUTABLE}" export ${DEST}
+      WORKING_DIRECTORY ${REPO}
+      RESULT_VARIABLE RESULT
+    )
+    IF(NOT RESULT EQUAL 0)
+      MESSAGE(STATUS "Ooops, bzr export failed")
+    ENDIF()
+  ENDFOREACH()
+ENDIF()
+
 IF(NOT BZR_EXECUTABLE)
   MESSAGE(STATUS "bzr not found or source dir is not a repo, use CPack")
   

=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2011-05-27 12:43:15 +0000
+++ b/cmake/plugin.cmake	2011-06-09 14:50:30 +0000
@@ -228,4 +228,11 @@ MACRO(CONFIGURE_PLUGINS)
       ADD_SUBDIRECTORY(${dir})
     ENDIF()
   ENDFOREACH()
+  FOREACH(dir ${dirs_plugin})
+    IF (EXISTS ${dir}/.bzr)
+      MESSAGE(STATUS "Found repo ${dir}/.bzr")
+      LIST(APPEND PLUGIN_BZR_REPOS "${dir}")
+    ENDIF()
+  ENDFOREACH()
+  SET(PLUGIN_REPOS "${PLUGIN_BZR_REPOS}" CACHE INTERNAL "")
 ENDMACRO()


--===============2131791425542170478==
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\
#   8unynpwifzh397ok
# target_branch: file:///export/home/didrik/repo/5.5-test_tp/
# testament_sha1: 32f17c8f97ba30a2caa29a1c59c8d7f0b8cb26b1
# timestamp: 2011-06-09 16:50:39 +0200
# source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\
#   5.5
# base_revision_id: dmitry.lenev@stripped\
#   nqsmjkj7r87zqm6z
# 
# Begin bundle
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
/4u5IpwoSF2efm0A


--===============2131791425542170478==--