From 81e12aa1f251b6fa27c86a08996d748de2718222 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 4 May 2014 01:06:57 +0200 Subject: acprep: fix verbose build when using ninja --- acprep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acprep b/acprep index 754a2427..1faeb4f6 100755 --- a/acprep +++ b/acprep @@ -942,7 +942,7 @@ class PrepareBuild(CommandLineApp): make_args.append('-j%d' % self.options.jobs) if self.options.verbose: - make_args.append('VERBOSE=1') + make_args.append('-v' if self.options.use_ninja else 'VERBOSE=1') self.log.debug('Configure arguments => ' + str(config_args)) self.log.debug('Makefile arguments => ' + str(make_args)) -- cgit v1.2.3 From cdfd7e58503e6f71212b734b7c85f1ed8ccaf3b7 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 4 May 2014 01:13:05 +0200 Subject: Disable BUILD_DOCS by default since a separate acprep make doc is necessary to build the documentation --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7289748..a6e52f95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ option(DISABLE_ASSERTS "Build without any internal consistency checks" OFF) option(BUILD_DEBUG "Build support for runtime debugging" OFF) option(BUILD_LIBRARY "Build and install Ledger as a library" ON) -option(BUILD_DOCS "Build and install documentation" ON) +option(BUILD_DOCS "Build and install documentation" OFF) option(BUILD_WEB_DOCS "Build version of documentation suitable for viewing online" OFF) option(BUILD_EMACSLISP "Build and install ledger-mode for Emacs" OFF) -- cgit v1.2.3 From 87bcfee8fd3054fa22deb1cc2e8eb32943c509e3 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 4 May 2014 01:14:39 +0200 Subject: Build info version of documentation --- doc/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 15f1318c..cd68f828 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -43,6 +43,17 @@ find_program(GROFF groff) foreach(file ${info_files}) get_filename_component(file_base ${file} NAME_WE) + + if(NOT MAKEINFO) + message(WARNING "Could not find makeinfo. Info version of documentation cannot be built.") + else() + add_custom_command(OUTPUT ${file_base}.info + COMMAND makeinfo --force --no-split -o ${file_base}.info ${CMAKE_CURRENT_SOURCE_DIR}/${file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + VERBATIM) + list(APPEND ledger_doc_files ${file_base}.info) + endif() + if(BUILD_WEB_DOCS) if(NOT MAKEINFO) message(FATAL_ERROR "Could not find makeinfo. HTML version of documentation cannot be built.") -- cgit v1.2.3 From 851dea238ac230d44c5df00dd738cee9aa5780d3 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 4 May 2014 01:16:19 +0200 Subject: Check for required TeX when building pdf documentation --- doc/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index cd68f828..e359c5e4 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -36,6 +36,7 @@ set(info_files ledger3.texi ledger-mode.texi) find_program(MAKEINFO makeinfo) find_program(TEXI2PDF texi2pdf) +find_program(TEX tex) find_program(MAN2HTML man2html) find_program(GROFF groff) @@ -56,9 +57,8 @@ foreach(file ${info_files}) if(BUILD_WEB_DOCS) if(NOT MAKEINFO) - message(FATAL_ERROR "Could not find makeinfo. HTML version of documentation cannot be built.") + message(WARNING "Could not find makeinfo. HTML version of documentation cannot be built.") endif() - add_custom_command(OUTPUT ${file_base}.html COMMAND makeinfo --force --html --no-split -o ${file_base}.html ${CMAKE_CURRENT_SOURCE_DIR}/${file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} @@ -66,8 +66,8 @@ foreach(file ${info_files}) list(APPEND ledger_doc_files ${file_base}.html) endif(BUILD_WEB_DOCS) - if(NOT TEXI2PDF) - message(WARNING "Could not find texi2pdf. PDF version of documentation will not be built.") + if(NOT TEXI2PDF OR NOT TEX) + message(WARNING "Could not find texi2pdf or tex. PDF version of documentation will not be built.") else() if(BUILD_A4_PDF) set(papersize --texinfo=@afourpaper) -- cgit v1.2.3 From dcb285ac556aa54aa01c60b3c1c9fa40199d8f06 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 4 May 2014 01:17:02 +0200 Subject: Improve installation of documentation files - Install info version of ledger documentation instead of the original texinfo sources - Install html version of ledger documentation when BUILD_WEB_DOCS is ON - Enable installation of documentation files from --output directory --- acprep | 3 +++ doc/CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/acprep b/acprep index 1faeb4f6..f9fb74d7 100755 --- a/acprep +++ b/acprep @@ -875,6 +875,9 @@ class PrepareBuild(CommandLineApp): if self.options.boost_include: conf_args.append('-DBOOST_INCLUDEDIR=%s' % self.options.boost_include) + if self.options.build_dir: + conf_args.append('-DBUILD_DIR=%s' % + self.options.build_dir) if self.prefix_directory(): conf_args.append('-DCMAKE_INSTALL_PREFIX=%s' % self.prefix_directory()) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index e359c5e4..8a9ba2fd 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -120,8 +120,19 @@ endif(CMAKE_INSTALL_MANDIR) foreach(file ${info_files}) get_filename_component(file_base ${file} NAME_WE) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file} + if (CMAKE_SOURCE_DIR STREQUAL BUILD_DIR) + set(doc_dir CMAKE_CURRENT_SOURCE_DIR) + else() + get_filename_component(dir_base ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE) + set(doc_dir "${CMAKE_SOURCE_DIR}/${BUILD_DIR}/${dir_base}") + endif() + + install(FILES ${doc_dir}/${file_base}.info DESTINATION ${CMAKE_INSTALL_INFODIR} COMPONENT doc) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file_base}.pdf + install(FILES ${doc_dir}/${file_base}.pdf DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc OPTIONAL) + if (BUILD_WEB_DOCS) + install(FILES ${doc_dir}/${file_base}.html + DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc) + endif(BUILD_WEB_DOCS) endforeach() -- cgit v1.2.3