From: Tor Didriksen
Date: June 10 2011 7:12am
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3438) Bug#12641810
List-Archive: http://lists.mysql.com/commits/139023
X-Bug: 12641810
Message-Id: <20110610071218.D500D2AA@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7814466620142120175=="

--===============7814466620142120175==
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:marko.makela@stripped

 3438 Tor Didriksen	2011-06-10
      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-10 07:12:10 +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 "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-10 07:12:10 +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()


--===============7814466620142120175==
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\
#   hha01c7beu1ogyd7
# target_branch: file:///export/home/didrik/repo/5.5-test_tp/
# testament_sha1: e2eec110bf1f61a5caa4bf3333ba739bef1a3846
# timestamp: 2011-06-10 09:12:18 +0200
# source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\
#   5.5
# base_revision_id: marko.makela@stripped\
#   ztc4qe2mczn6088o
# 
# Begin bundle
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
61ybUA==


--===============7814466620142120175==--