Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. *Read more...*

Feature #780295 ยป 0019-Combine-NETWORK_CAPSTRING_MANDATORY-and-NETWORK_CAPS.patch

Marko Lindqvist, 2019-02-12 04:32 PM

View differences:

common/capstr.c
#include "capstr.h"
#define NETWORK_CAPSTRING (NETWORK_CAPSTRING_MANDATORY " " \
NETWORK_CAPSTRING_OPTIONAL)
static char our_capability_internal[MAX_LEN_CAPSTR];
const char *const our_capability = our_capability_internal;
fc_version
# - No new mandatory capabilities can be added to the release branch; doing
# so would break network capability of supposedly "compatible" releases.
#
NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.1-2019.Feb.12"
NETWORK_CAPSTRING_OPTIONAL=""
NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2019.Feb.12"
FREECIV_DISTRIBUTOR=""
gen_headers/generate_version_header.sh
echo "#define VERSION_LABEL \"$VERSION_LABEL\"" >> $1
echo "#define VERSION_STRING \"$VERSION_STRING\"" >> $1
echo "" >> $1
echo "#define NETWORK_CAPSTRING_MANDATORY \"$NETWORK_CAPSTRING_MANDATORY\"" >> $1
echo "#define NETWORK_CAPSTRING_OPTIONAL \"$NETWORK_CAPSTRING_OPTIONAL\"" >> $1
echo "#define NETWORK_CAPSTRING \"$NETWORK_CAPSTRING\"" >> $1
echo "" >> $1
echo "#define FOLLOWTAG \"$DEFAULT_FOLLOW_TAG\"" >> $1
echo "#define FREECIV_DISTRIBUTOR \"$FREECIV_DISTRIBUTOR\"" >> $1
scripts/capabilities
file=`find $basedir -name "fc_version"`
old=`cat $file \
| grep "NETWORK_CAPSTRING_MANDATORY=" \
| sed 's/NETWORK_CAPSTRING_MANDATORY="\(.*\)".*/\1/'`
| grep "NETWORK_CAPSTRING=" \
| sed 's/NETWORK_CAPSTRING="\(.*\)".*/\1/'`
echo "* Replacing \"${old}\" with \"${string}\" in:"
cat $file \
    (1-1/1)