From 155df6c6574bbc23f8458ea958b838c02cd263d7 Mon Sep 17 00:00:00 2001 From: Tor Didriksen Date: Fri, 10 Jun 2011 09:12:10 +0200 Subject: 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. --- cmake/make_dist.cmake.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'cmake/make_dist.cmake.in') diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index ef1677db1c0..5aa1fc8fd0e 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -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") -- cgit v1.2.1