List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:June 9 2011 2:50pm
Subject:bzr commit into mysql-5.5 branch (tor.didriksen:3435) Bug#12641810
View as plain text  
#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()


Attachment: [text/bzr-bundle] bzr/tor.didriksen@oracle.com-20110609145030-8unynpwifzh397ok.bundle
Thread
bzr commit into mysql-5.5 branch (tor.didriksen:3435) Bug#12641810Tor Didriksen9 Jun