From 87ca8c227ae74da9780e5fc92d12f9da28f0b153 Mon Sep 17 00:00:00 2001 From: Moshe Kaplan Date: Mon, 11 Jul 2022 14:44:23 +0000 Subject: tools: Port make-version.pl to Python --- packaging/nsis/CMakeLists.txt | 2 +- packaging/source/git-export-release.sh.in | 2 +- packaging/wix/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 6ba6a68b97..61cc6e566b 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -73,7 +73,7 @@ set(USBPCAP_PACKAGE_VERSION "1.5.4.0") # To do: # - Sync the various version names between CMake and NSIS. -# - Set CMakeLists.txt version strings in tools/make-version.pl +# - Set CMakeLists.txt version strings in tools/make-version.py # - Add a VERSION_EXTRA cmake option set (PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) set (LOG_PRODUCT_VERSION ${LOG_PROJECT_MAJOR_VERSION}.${LOG_PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) diff --git a/packaging/source/git-export-release.sh.in b/packaging/source/git-export-release.sh.in index f0ebde4039..cc6794d752 100755 --- a/packaging/source/git-export-release.sh.in +++ b/packaging/source/git-export-release.sh.in @@ -33,7 +33,7 @@ shift $(( OPTIND - 1 )) # The remaining parameter, if set, is a package version such as 3.4.5 # or 3.4.5-67-gabcd4321 -# By default the version from make-version.pl + CMake is used. +# By default the version from make-version.py + CMake is used. PROJECT_VERSION=@PROJECT_VERSION@ if test -n "${1-}"; then PROJECT_VERSION="$1" diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 6f229fe0cd..a0925e9e71 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -71,7 +71,7 @@ endif() # To do: # - Sync the various version names between CMake and Wix. -# - Set CMakeLists.txt version strings in tools/make-version.pl +# - Set CMakeLists.txt version strings in tools/make-version.py # - Add a VERSION_EXTRA cmake option set (VERSION "${PROJECT_VERSION}") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) -- cgit v1.2.3