From c3db4383b6a1e737bd931ab4785b9c5a456bad49 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Fri, 7 Jun 2024 10:42:23 +0200 Subject: [PATCH] Determine master version via git tag. --- .gitlab-ci.yml | 2 +- documentation/ethercat_doc.tex | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49aa4da1..e3d2824e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,7 +119,7 @@ pdf: image: registry.gitlab.com/etherlab.org/build-container-factory/leap-15.3:texlive script: - cd documentation - - git show -s --format="\def\revision{%h}\def\gitversion{%(describe)}\def\gitauthor{%an}\def\isodate#1-#2-#3x{\day=#3 \month=#2 \year=#1}\isodate %csx" HEAD > git.tex + - git show -s --format="\def\revision{%h}\def\gitversion{%(describe)}\def\gittag{%(describe:abbrev=0)}\def\gitauthor{%an}\def\isodate#1-#2-#3x{\day=#3 \month=#2 \year=#1}\isodate %csx" HEAD > git.tex - make - make index - make diff --git a/documentation/ethercat_doc.tex b/documentation/ethercat_doc.tex index 5102fdce..56769b17 100644 --- a/documentation/ethercat_doc.tex +++ b/documentation/ethercat_doc.tex @@ -57,7 +57,7 @@ \input{git} -\newcommand{\masterversion}{1.5.2} +\newcommand{\masterversion}{\gittag} \newcommand{\linenum}[1]{\normalfont\textcircled{\tiny #1}} \makeindex @@ -3171,8 +3171,8 @@ There are several ways to get the master software: \begin{enumerate} \item An official release (for example \masterversion), can be downloaded from -the master's website\footnote{\url{http://etherlab.org/en/ethercat/index.php}} -at~the EtherLab project~\cite{etherlab} as a tarball. +the master's website\footnote{\url{https://etherlab.org/ethercat}} +at the EtherLab project~\cite{etherlab} as a tarball. \item The most recent development revision (and moreover any other revision) can be obtained via the Git~\cite{git} repository on the master's @@ -3492,7 +3492,7 @@ KERNEL=="EtherCAT[0-9]*", MODE="0664", GROUP="users" \bibitem{etherlab} Ingenieurgemeinschaft IgH: EtherLab -- Open Source Toolkit for rapid realtime code generation under Linux with Simulink/RTW and EtherCAT -technology. \url{http://etherlab.org/en}, 2008. +technology. \url{https://etherlab.org}, 2024. \bibitem{dlspec} IEC 61158-4-12: Data-link Protocol Specification. International Electrotechnical Commission (IEC), 2005.