diff --git a/azure-pipelines/templates/release-prepare-source.yml b/azure-pipelines/templates/release-prepare-source.yml index 3eb148aef5..a3f5a137b3 100644 --- a/azure-pipelines/templates/release-prepare-source.yml +++ b/azure-pipelines/templates/release-prepare-source.yml @@ -18,7 +18,7 @@ steps: fi # 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 TZ='UTC' date +"%Y-%m-%d %H:%M UTC" > .release_date diff --git a/cmake/scripts/FindVersion.cmake b/cmake/scripts/FindVersion.cmake index 4e81e30a61..bb60ff1cdb 100644 --- a/cmake/scripts/FindVersion.cmake +++ b/cmake/scripts/FindVersion.cmake @@ -156,8 +156,8 @@ endif () message(STATUS "Version string: ${REV_VERSION}") if (GENERATE_OTTDREV) - message(STATUS "Generating .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") + message(STATUS "Generating ${GENERATE_OTTDREV}") + 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) message(STATUS "Generating rev.cpp") configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in" diff --git a/version_utils.sh b/version_utils.sh index f06682fe45..eff8916086 100755 --- a/version_utils.sh +++ b/version_utils.sh @@ -113,7 +113,7 @@ fi if [ -n "$WRITE" ]; then 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 mv .ottdrev-vc-tmp .ottdrev-vc fi