dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/lang/dutch.txt
#	src/lang/korean.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/rail.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2019-02-13 19:09:06 +00:00
parent 3af5861693 1db19208ba
commit 2fdcc52321
107 changed files with 785 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
findversion.sh
View File

@@ -82,8 +82,10 @@ if [ -d "$ROOT_DIR/.git" ]; then
if [ -n "$TAG" ]; then
VERSION="${TAG}"
ISTAG="1"
else
VERSION="${ISODATE}-${BRANCH}${hashprefix}${SHORTHASH}"
ISTAG="0"
fi
elif [ -f "$ROOT_DIR/.ottdrev-vc" ]; then
VERSION_DATA="`cat "$ROOT_DIR/.ottdrev-vc" | sed -n -e '1 p;'`"
@@ -92,6 +94,7 @@ elif [ -f "$ROOT_DIR/.ottdrev-vc" ]; then
ISODATE="`echo "$VERSION_DATA" | cut -f 2 -d' '`"
MODIFIED="`echo "$VERSION_DATA" | cut -f 3 -d' '`"
HASH="`echo "$VERSION_DATA" | cut -f 4 -d' '`"
ISTAG="`echo "$VERSION_DATA" | cut -f 5 -d' '`"
if [ "$MODIFIED" = "2" ]; then
VERSION="`echo "$VERSION" | sed -e 's/M$//'`"
fi
@@ -117,10 +120,11 @@ else
ISODATE=""
TAG=""
VERSION=""
ISTAG="0"
fi
if [ "$MODIFIED" -eq "2" ]; then
VERSION="${VERSION}M"
fi
echo "$VERSION $ISODATE $MODIFIED $HASH"
echo "$VERSION $ISODATE $MODIFIED $HASH $ISTAG"