mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the build process to take into account the rst files

Browse Source
This commit is contained in:
louiz’
2016-05-23 11:51:03 +02:00
parent c7299656fc
commit 38202e5f6e
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+7 -5
View File
@@ -61,15 +61,17 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/")
# #
## Documentation ## Documentation
# #
execute_process(COMMAND "date" "+%Y-%m-%d" OUTPUT_VARIABLE DOC_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(MAN_PAGE ${CMAKE_CURRENT_BINARY_DIR}/doc/${PROJECT_NAME}.1) set(MAN_PAGE ${CMAKE_CURRENT_BINARY_DIR}/doc/${PROJECT_NAME}.1)
set(DOC_PAGE ${CMAKE_CURRENT_SOURCE_DIR}/doc/${PROJECT_NAME}.1.md) set(DOC_PAGE ${CMAKE_CURRENT_SOURCE_DIR}/doc/${PROJECT_NAME}.1.rst)
find_program(RONN_EXECUTABLE NAMES ronn find_program(PANDOC_EXECUTABLE NAMES pandoc
DOC "The ronn software, to build the man page from the markdown documentation") DOC "The pandoc software, to build the man page from the rst documentation")
if(RONN_EXECUTABLE) if(PANDOC_EXECUTABLE)
set(WITH_DOC true) set(WITH_DOC true)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/)
add_custom_command(OUTPUT ${MAN_PAGE} add_custom_command(OUTPUT ${MAN_PAGE}
COMMAND ${RONN_EXECUTABLE} --roff < ${DOC_PAGE} > ${MAN_PAGE} COMMAND ${PANDOC_EXECUTABLE} -M date="${DOC_DATE}" -s -t man ${DOC_PAGE} -o ${MAN_PAGE}
DEPENDS ${DOC_PAGE}) DEPENDS ${DOC_PAGE})
add_custom_target(doc ALL DEPENDS ${MAN_PAGE}) add_custom_target(doc ALL DEPENDS ${MAN_PAGE})
endif() endif()
INSTALL.rst
+1 -1
View File
@@ -18,7 +18,7 @@ Tools:
- A C++14 compiler (clang >= 3.4 or gcc >= 4.9 for example) - A C++14 compiler (clang >= 3.4 or gcc >= 4.9 for example)
- CMake - CMake
- ronn (optional) to build the man page - pandoc (optional) to build the man page
Libraries: Libraries:
~~~~~~~~~~ ~~~~~~~~~~
doc/biboumi.1.rst
-1
View File
@@ -4,7 +4,6 @@ Biboumi(1) User Manual
.. contents:: :depth: 2 .. contents:: :depth: 2
NAME NAME
==== ====
docker/biboumi-test/debian/Dockerfile
+1 -1
View File
@@ -18,7 +18,7 @@ RUN apt install -y libexpat1-dev
RUN apt install -y libidn11-dev RUN apt install -y libidn11-dev
RUN apt install -y uuid-dev RUN apt install -y uuid-dev
RUN apt install -y libsystemd-dev RUN apt install -y libsystemd-dev
RUN apt install -y ruby-ronn RUN apt install -y pandoc
# Needed to run tests # Needed to run tests
RUN apt install -y git RUN apt install -y git
docker/biboumi-test/fedora/Dockerfile
+1 -1
View File
@@ -18,7 +18,7 @@ RUN dnf install -y expat-devel
RUN dnf install -y libidn-devel RUN dnf install -y libidn-devel
RUN dnf install -y uuid-devel RUN dnf install -y uuid-devel
RUN dnf install -y systemd-devel RUN dnf install -y systemd-devel
RUN dnf install -y rubygem-ronn RUN dnf install -y pandoc
# Needed to run tests # Needed to run tests
RUN dnf install -y git RUN dnf install -y git
packaging/biboumi.spec.cmake
+2 -5
View File
@@ -13,7 +13,7 @@ BuildRequires: libuuid-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: systemd BuildRequires: systemd
BuildRequires: rubygem-ronn BuildRequires: pandoc
%global _hardened_build 1 %global _hardened_build 1
@@ -39,9 +39,6 @@ cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \
-DWITH_SYSTEMD=1 \ -DWITH_SYSTEMD=1 \
-DWITH_LIBIDN=1 -DWITH_LIBIDN=1
# The documentation is in utf-8, ronn fails to build it if that locale is
# not specified
export LC_ALL=en_GB.utf-8
make %{?_smp_mflags} make %{?_smp_mflags}
@@ -56,7 +53,7 @@ make check %{?_smp_mflags}
%files %files
%{_bindir}/%{name} %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1*
%doc README.md COPYING doc/biboumi.1.md %doc README.rst COPYING doc/biboumi.1.rst
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%config(noreplace) %{biboumi_confdir}/biboumi.cfg %config(noreplace) %{biboumi_confdir}/biboumi.cfg