colin/mirror-conky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate docs & extras (syntax files) build.

Browse Source 
Rather than piggybacking on the BUILD_DOCS flag, use BUILD_EXTRAS to
enable building the nano & vim syntax files. This is so that people can
generate the extras without having to install pandoc.
This commit is contained in:
Brenden Matthews
2022-10-14 08:35:47 -05:00
committed by Brenden Matthews
parent b5df4dbcd1
commit 97687633a7
4 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -47,7 +47,9 @@ set(conky_sources ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/build.h)
add_subdirectory(lua) add_subdirectory(lua)
add_subdirectory(data) add_subdirectory(data)
add_subdirectory(doc) add_subdirectory(doc)
add_subdirectory(extras) if(BUILD_EXTRAS)
add_subdirectory(extras)
endif(BUILD_EXTRAS)
# Include 3rdparty toluapp # Include 3rdparty toluapp
add_subdirectory(3rdparty/toluapp) add_subdirectory(3rdparty/toluapp)

3
cmake/ConkyBuildOptions.cmake
View File

@@ -85,7 +85,8 @@ mark_as_advanced(RELEASE)
option(MAINTAINER_MODE "Enable maintainer mode" false) option(MAINTAINER_MODE "Enable maintainer mode" false)
option(BUILD_DOCS "Build documentation & extras (syntax files for editors)" false) option(BUILD_DOCS "Build documentation" false)
option(BUILD_EXTRAS "Build extras (includes syntax files for editors)" false)
option(BUILD_I18N "Enable if you want internationalization support" true) option(BUILD_I18N "Enable if you want internationalization support" true)
if(BUILD_I18N) if(BUILD_I18N)

6
cmake/ConkyPlatformChecks.cmake
View File

@@ -485,10 +485,12 @@ if(BUILD_DOCS)
message(FATAL_ERROR "Unable to find program 'pandoc'") message(FATAL_ERROR "Unable to find program 'pandoc'")
endif(NOT APP_PANDOC) endif(NOT APP_PANDOC)
mark_as_advanced(APP_PANDOC) mark_as_advanced(APP_PANDOC)
endif(BUILD_DOCS)
if(BUILD_DOCS OR BUILD_EXTRAS)
# Python3 with Jinja2 and PyYaml required for manpage generation. # Python3 with Jinja2 and PyYaml required for manpage generation.
find_package(Python3 REQUIRED COMPONENTS Interpreter) find_package(Python3 REQUIRED COMPONENTS Interpreter)
include(CMakePrintHelpers)
execute_process( execute_process(
COMMAND ${Python3_EXECUTABLE} -c "import yaml" COMMAND ${Python3_EXECUTABLE} -c "import yaml"
RESULT_VARIABLE EXIT_CODE RESULT_VARIABLE EXIT_CODE
@@ -514,7 +516,7 @@ if(BUILD_DOCS)
"The \"Jinja2\" Python3 package is not installed. Please install it using the following command: \"pip3 install Jinja2\"." "The \"Jinja2\" Python3 package is not installed. Please install it using the following command: \"pip3 install Jinja2\"."
) )
endif() endif()
endif(BUILD_DOCS) endif(BUILD_DOCS OR BUILD_EXTRAS)
if(CMAKE_BUILD_TYPE MATCHES "Debug") if(CMAKE_BUILD_TYPE MATCHES "Debug")
set(DEBUG true) set(DEBUG true)

46
extras/CMakeLists.txt
View File

@@ -18,27 +18,25 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
if(BUILD_DOCS) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/nano)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/nano) add_custom_target(conky.nanorc
add_custom_target(conky.nanorc ALL
ALL COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/render.py nano/conky.nanorc.j2 > ${CMAKE_CURRENT_BINARY_DIR}/nano/conky.nanorc
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/render.py nano/conky.nanorc.j2 > ${CMAKE_CURRENT_BINARY_DIR}/nano/conky.nanorc WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} SOURCES
SOURCES ${CMAKE_SOURCE_DIR}/doc/variables.yaml
${CMAKE_SOURCE_DIR}/doc/variables.yaml ${CMAKE_SOURCE_DIR}/doc/config_settings.yaml
${CMAKE_SOURCE_DIR}/doc/config_settings.yaml ${CMAKE_SOURCE_DIR}/doc/lua.yaml
${CMAKE_SOURCE_DIR}/doc/lua.yaml ${CMAKE_CURRENT_SOURCE_DIR}/nano/conky.nanorc.j2
${CMAKE_CURRENT_SOURCE_DIR}/nano/conky.nanorc.j2 )
) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/vim/syntax)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/vim/syntax) add_custom_target(conkyrc.vim
add_custom_target(conkyrc.vim ALL
ALL COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/render.py vim/syntax/conkyrc.vim.j2 > ${CMAKE_CURRENT_BINARY_DIR}/vim/syntax/conkyrc.vim
COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/doc/render.py vim/syntax/conkyrc.vim.j2 > ${CMAKE_CURRENT_BINARY_DIR}/vim/syntax/conkyrc.vim WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} SOURCES
SOURCES ${CMAKE_SOURCE_DIR}/doc/variables.yaml
${CMAKE_SOURCE_DIR}/doc/variables.yaml ${CMAKE_SOURCE_DIR}/doc/config_settings.yaml
${CMAKE_SOURCE_DIR}/doc/config_settings.yaml ${CMAKE_SOURCE_DIR}/doc/lua.yaml
${CMAKE_SOURCE_DIR}/doc/lua.yaml ${CMAKE_CURRENT_SOURCE_DIR}/vim/syntax/conkyrc.vim.j2
${CMAKE_CURRENT_SOURCE_DIR}/vim/syntax/conkyrc.vim.j2 )
)
endif(BUILD_DOCS)