From 05df71abd9c3844aeddfb7261ba71d19e56d94fe Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 21 May 2014 14:50:01 +0200 Subject: [PATCH] remove support for per-plugin bzr repositories we don't have closed-source plugins --- cmake/make_dist.cmake.in | 17 ----------------- cmake/plugin.cmake | 7 ------- 2 files changed, 24 deletions(-) diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index ada27c36926..4cb05081e6b 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -28,7 +28,6 @@ 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@") @@ -54,22 +53,6 @@ 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") diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 07372849a10..6f3dec4619a 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -245,11 +245,4 @@ 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()