Skip to content
Snippets Groups Projects
Commit 1e462675 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

New manual version numbering scheme, without CMake machinery.

parent 6397a836
No related branches found
No related tags found
No related merge requests found
project(BornAgainManual NONE) # This CMakeLists.txt is not actively maintained;
# we usually do not use CMake to build the manual.
# version is read from main directory, project(BornAgainManual NONE)
# and written to cmake/bornagain/scripts/UserManualVersion.tex.in
include( ../../VERSION.cmake )
if(POLICY CMP0046) if(POLICY CMP0046)
cmake_policy(SET CMP0046 NEW) cmake_policy(SET CMP0046 NEW)
...@@ -13,19 +12,10 @@ set(PDFLATEX_COMPILER xelatex) ...@@ -13,19 +12,10 @@ set(PDFLATEX_COMPILER xelatex)
set(LATEX_COMPILER_FLAGS "-interaction=errorstopmode" CACHE STRING "Flags passed to latex." ) set(LATEX_COMPILER_FLAGS "-interaction=errorstopmode" CACHE STRING "Flags passed to latex." )
if(BORNAGAIN_USERMANUAL) if(BORNAGAIN_USERMANUAL)
# --- configure a header file to pass CMake settings to the source code
configure_file(
"${CMAKE_SOURCE_DIR}/cmake/bornagain/scripts/UserManualVersion.tex.in"
"${CMAKE_SOURCE_DIR}/Doc/UserManual/UserManualVersion.tex"
)
include(UseLATEX) include(UseLATEX)
else() else()
# to compile in standalone mode # to compile in standalone mode
configure_file(
"${CMAKE_SOURCE_DIR}/../../cmake/bornagain/scripts/UserManualVersion.tex.in"
"${CMAKE_SOURCE_DIR}/../../Doc/UserManual/UserManualVersion.tex"
)
include("../../cmake/modules/UseLATEX.cmake") include("../../cmake/modules/UseLATEX.cmake")
endif() endif()
......
...@@ -163,11 +163,8 @@ that can be found online at \url{http://apps.jcns.fz-juelich.de/doxy/BornAgain/i ...@@ -163,11 +163,8 @@ that can be found online at \url{http://apps.jcns.fz-juelich.de/doxy/BornAgain/i
Several important chapters are still incomplete, or only consist of a placeholder.} Several important chapters are still incomplete, or only consist of a placeholder.}
We intend to publish the missing material successively, We intend to publish the missing material successively,
along with new software release. along with new software release.
To avoid confusion, the manual carries
the same version number as the software,
even though it is in a less mature state.
In this manual, we use the following colored boxes to highlight We use the following colored boxes to highlight
certain information: certain information:
\def\demobox#1{\noindent\strut\hspace{.2\TW}\begin{minipage}{.75\textwidth}#1 \def\demobox#1{\noindent\strut\hspace{.2\TW}\begin{minipage}{.75\textwidth}#1
...@@ -193,7 +190,7 @@ with the software or the documentation.}} ...@@ -193,7 +190,7 @@ with the software or the documentation.}}
how the theory exposed in this manual is actually used in \BornAgain.}} how the theory exposed in this manual is actually used in \BornAgain.}}
\medskip \medskip
This is a \tuto{1}{link to the online docs}. \noindent\strut\hspace{.2\TW}This is a \tuto{1}{link to the online docs}.
\medskip \medskip
\setCpp \setCpp
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
%% %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\input{UserManualVersion} % defines command UserManualVersionNumber
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
% Title page % Title page
%------------------------------------------------------------------------------- %-------------------------------------------------------------------------------
...@@ -30,7 +28,7 @@ X-ray and neutron small-angle scattering\\[.2ex] ...@@ -30,7 +28,7 @@ X-ray and neutron small-angle scattering\\[.2ex]
at grazing incidence\\[15mm] at grazing incidence\\[15mm]
User Manual\\[5mm] User Manual\\[5mm]
\large \large
Version \UserManualVersionNumber\ (\today)\\[30mm] software version 1.7, manual edition 1.7-1$\beta$ (\today)\\[30mm]
\Large \Large
\authors\\[10mm] \authors\\[10mm]
\large \large
......
% User Manual version number
% This file is automatically generated by CMakeLists.txt
% using cmake/scripts/UserManualVersion.tex.in
\newcommand{\UserManualVersionNumber}
{1.6.99}
% User Manual version number
% This file is automatically generated by CMakeLists.txt
% using cmake/scripts/UserManualVersion.tex.in
\newcommand{\UserManualVersionNumber}
{@BornAgain_VERSION_MAJOR@.@BornAgain_VERSION_MINOR@.@BornAgain_VERSION_PATCH@}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment