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

version_utils.sh: Fix getting current version

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-12 12:59:24 +01:00
parent 6d1535b902
commit dbdab67cda
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
azure-pipelines/templates/release-prepare-source.yml
View File

@@ -18,7 +18,7 @@ steps:
fi fi
# Generate .ottdrev, which contains the version information # Generate .ottdrev, which contains the version information
cmake -DGENERATE_OTTDREV=1 -P cmake/scripts/FindVersion.cmake cmake -DGENERATE_OTTDREV=.ottdrev -P cmake/scripts/FindVersion.cmake
./azure-pipelines/changelog.sh > .changelog ./azure-pipelines/changelog.sh > .changelog
TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date

4
cmake/scripts/FindVersion.cmake
View File

@@ -156,8 +156,8 @@ endif ()
message(STATUS "Version string: ${REV_VERSION}") message(STATUS "Version string: ${REV_VERSION}")
if (GENERATE_OTTDREV) if (GENERATE_OTTDREV)
message(STATUS "Generating .ottdrev") message(STATUS "Generating ${GENERATE_OTTDREV}")
file(WRITE ${CMAKE_SOURCE_DIR}/.ottdrev "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\t${REV_YEAR}\n") file(WRITE ${CMAKE_SOURCE_DIR}/${GENERATE_OTTDREV} "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\t${REV_YEAR}\n")
else (GENERATE_OTTDREV) else (GENERATE_OTTDREV)
message(STATUS "Generating rev.cpp") message(STATUS "Generating rev.cpp")
configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in" configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"

2
version_utils.sh
View File

@@ -113,7 +113,7 @@ fi
if [ -n "$WRITE" ]; then if [ -n "$WRITE" ]; then
find_hasher find_hasher
./findversion.sh > .ottdrev-vc-tmp cmake -DGENERATE_OTTDREV=.ottdrev-vc-tmp -P cmake/scripts/FindVersion.cmake
output_hash_list | $HASH_CMD >> .ottdrev-vc-tmp output_hash_list | $HASH_CMD >> .ottdrev-vc-tmp
mv .ottdrev-vc-tmp .ottdrev-vc mv .ottdrev-vc-tmp .ottdrev-vc
fi fi