File fix-manpages.patch of Package springrts

Overview Repositories Revisions Requests Users Attributes Meta

File fix-manpages.patch of Package springrts

From 553a21526b144568b608a0507674b076ec80d9f9 Mon Sep 17 00:00:00 2001
From: abma <spring@abma.de>
Date: Sun, 6 Feb 2022 00:23:09 +0100
Subject: [PATCH] travis: try to use single target + compile manpages, too

try to fix manpages
---
 .travis.yml                     | 3 +--
 doc/manpages/make_manpages.sh   | 6 +++---
 doc/manpages/spring.6.txt       | 8 ++++----
 tools/scripts/travis_install.sh | 3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f973c0db34..3489438e85e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,7 @@ env:
      #   you have to test using a branch in the main repo
     - secure: "QSZUdSH72Y+X73FBy6cDdhlMH3ppMewbU/LquXe/sIUdJE0LmcCFHnPayI91TTRgS8r6YXKh3DIhE9XTs1OUxmV+RUL84z85byAtotb+ukHSzlSLSGGZfrqey+/vrCXbYykfaxhazlVDfk5vx63lRYiD5lp5KLL24+PIdK6Qd5E="
   matrix:
-    - TARGET="CppTestAI HughAI KAIK NullAI NullJavaAI NullOOJavaAI CircuitAI demotool engine-dedicated"
-    - TARGET="tests engine-headless check"
+    - TARGET="CppTestAI HughAI KAIK NullAI NullJavaAI NullOOJavaAI CircuitAI demotool engine-dedicated manpages tests engine-headless check"
 matrix:
   fast_finish: true
 
diff --git a/doc/manpages/make_manpages.sh b/doc/manpages/make_manpages.sh
index 94393f68627..cec2122c9fa 100755
--- a/doc/manpages/make_manpages.sh
+++ b/doc/manpages/make_manpages.sh
@@ -41,11 +41,11 @@ else
 fi
 
 # Sanity check.
-if ! which ${EXEC_ASCIIDOC} > /dev/null; then
+if ! command -v ${EXEC_ASCIIDOC} > /dev/null; then
 	echo "Error: Could not find asciidoc." >&2
 	exit 1
 fi
-if ! which ${EXEC_XSLTPROC} > /dev/null; then
+if ! command -v ${EXEC_XSLTPROC} > /dev/null; then
 	echo "Error: Could not find xsltproc." >&2
 	exit 1
 fi
@@ -53,7 +53,7 @@ if [ ! -f ${XSL_DOCBOOK} ]; then
 	echo "Error: Could not find docbook.xsl." >&2
 	exit 1
 fi
-if ! which ${EXEC_7Z} > /dev/null; then
+if ! command -v ${EXEC_7Z} > /dev/null; then
 	echo "Error: Could not find 7z." >&2
 	exit 1
 fi
diff --git a/doc/manpages/spring.6.txt b/doc/manpages/spring.6.txt
index f1e39e05a14..3317b0fac30 100644
--- a/doc/manpages/spring.6.txt
+++ b/doc/manpages/spring.6.txt
@@ -6,7 +6,7 @@
 Name
 ----
 ifdef::DEFAULT[{BINARY} - An open source RTS game engine - Default Engine]
-ifdef::LEGACY[{BINARY} - An open source RTS game engine - Legacy Engine]
+ifdef::OPENGL4[{BINARY} - An open source RTS game engine - OpenGL4 Engine]
 ifdef::HEADLESS[{BINARY} - An open source RTS game engine - Headless Engine]
 ifdef::DEDICATED[{BINARY} - An open source RTS game engine - Dedicated Server]
 
@@ -62,10 +62,10 @@ The engine can run graphics and simulation in two separate threads,
 depending on the game and engine settings.
 This will typically boost the performance on multi-core systems.
 endif::DEFAULT[]
-ifdef::LEGACY[]
+ifdef::OPENGL4[]
 This engine version runs graphics and simulation in a single thread,
 and may marginally increase the performance on single-core systems.
-endif::LEGACY[]
+endif::OPENGL4[]
 
 Options
 -------
@@ -289,7 +289,7 @@ The filename of such config files can be as following:
 See also
 --------
 ifndef::DEFAULT[spring(6)]
-ifndef::LEGACY[spring-opengl4(6)]
+ifndef::OPENGL4[spring-opengl4(6)]
 ifndef::HEADLESS[spring-headless(6)]
 ifndef::DEDICATED[spring-dedicated(6)]
 
diff --git a/tools/scripts/travis_install.sh b/tools/scripts/travis_install.sh
index 5716cb9ffb1..8035d6da18b 100755
--- a/tools/scripts/travis_install.sh
+++ b/tools/scripts/travis_install.sh
@@ -17,7 +17,8 @@ set -e
 
 sudo apt-get update
 sudo apt-get install -y libglew-dev libsdl2-dev libdevil-dev libopenal-dev libogg-dev \
-  libvorbis-dev libfreetype6-dev p7zip-full libxcursor-dev libunwind8-dev libgles2-mesa-dev
+  libvorbis-dev libfreetype6-dev p7zip-full libxcursor-dev libunwind8-dev libgles2-mesa-dev \
+  asciidoc
 
 #sudo apt-get install -y binutils-gold cmake cmake-data

Places

File fix-manpages.patch of Package springrts

Places