From 0b72d328fea0be03705fb5b6e167cb488ab7b75d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 7 Apr 2023 07:41:13 +0300 Subject: [PATCH 19/19] Protocol: Add "debug" capability to FREECIV_DEBUG builds See osdn #47768 Signed-off-by: Marko Lindqvist --- fc_version | 3 +++ gen_headers/generate_version_header.sh | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fc_version b/fc_version index ccd57dd84c..3a90a0d081 100755 --- a/fc_version +++ b/fc_version @@ -72,6 +72,9 @@ DEFAULT_FOLLOW_TAG=S3_3 # - No new mandatory capabilities can be added to the release branch; doing # so would break network capability of supposedly "compatible" releases. # +# On FREECIV_DEBUG builds, optional capability "debug" gets automatically +# appended to this. +# NETWORK_CAPSTRING="+Freeciv.Devel-${MAIN_VERSION}-2023.Apr.06" FREECIV_DISTRIBUTOR="" diff --git a/gen_headers/generate_version_header.sh b/gen_headers/generate_version_header.sh index 9aa3a786a2..80e80f2772 100755 --- a/gen_headers/generate_version_header.sh +++ b/gen_headers/generate_version_header.sh @@ -20,7 +20,11 @@ echo "#ifndef VERSION_STRING" >> $1 echo "#define VERSION_STRING \"$VERSION_STRING\"" >> $1 echo "#endif" >> $1 echo "" >> $1 -echo "#define NETWORK_CAPSTRING \"$NETWORK_CAPSTRING\"" >> $1 +echo "#ifdef FREECIV_DEBUG" >> $1 +echo "#define NETWORK_CAPSTRING \"${NETWORK_CAPSTRING} debug\"" >> "$1" +echo "#else" >> "$1" +echo "#define NETWORK_CAPSTRING \"${NETWORK_CAPSTRING}\"" >> "$1" +echo "#endif /* FREECIV_DEBUG */" >> "$1" echo "" >> $1 echo "#ifndef FOLLOWTAG" >> $1 echo "#define FOLLOWTAG \"$DEFAULT_FOLLOW_TAG\"" >> $1 -- 2.39.2