aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Müller <marcus@hostalia.de>2020-02-16 12:07:23 +0100
committerMarcus Müller <marcus@hostalia.de>2020-02-16 12:07:23 +0100
commit351a22cc0e2fc05f4ca6ccb08de6ca1e83b62a70 (patch)
treecc4b7faefce6470f91d2274b1164ef84efda8b7b
parentRelease 3.7.14.0 (diff)
downloadgnuradio-351a22cc0e2fc05f4ca6ccb08de6ca1e83b62a70.tar.xz
gnuradio-351a22cc0e2fc05f4ca6ccb08de6ca1e83b62a70.zip
dtools: fix roll_tarball to work on 3.7-series CMakeLists.txt
-rwxr-xr-xdtools/bin/roll-tarball.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/dtools/bin/roll-tarball.sh b/dtools/bin/roll-tarball.sh
index ff638f375..4a7c32f33 100755
--- a/dtools/bin/roll-tarball.sh
+++ b/dtools/bin/roll-tarball.sh
@@ -29,10 +29,10 @@ gpg=$(which gpg2 2> /dev/null || which gpg)
gz=$(which pigz 2> /dev/null || which gzip)
echo "Figuring out versions"
-version_major=$(grep -i 'set(version_major' CMakeLists.txt |sed 's/.*VERSION_MAJOR[[:space:]]*\([[:digit:]]*\))/\1/i')
-version_api=$(grep -i 'set(version_api' CMakeLists.txt |sed 's/.*VERSION_API[[:space:]]*\([[:digit:]]*\))/\1/i')
-version_abi=$(grep -i 'set(version_abi' CMakeLists.txt |sed 's/.*VERSION_ABI[[:space:]]*\([[:digit:]]*\))/\1/i')
-version_patch=$(grep -i 'set(version_patch' CMakeLists.txt |sed 's/.*VERSION_PATCH[[:space:]]*\([[:digit:]]*\))/\1/i')
+version_major=$(grep -i 'set(version_info_major' CMakeLists.txt |sed 's/.*VERSION_INFO_MAJOR_VERSION[[:space:]]*\([[:digit:]]*\))/\1/i')
+version_api=$(grep -i 'set(version_info_api' CMakeLists.txt |sed 's/.*VERSION_INFO_API_COMPAT[[:space:]]*\([[:digit:]]*\))/\1/i')
+version_abi=$(grep -i 'set(version_info_minor' CMakeLists.txt |sed 's/.*VERSION_INFO_MINOR_VERSION[[:space:]]*\([[:digit:]]*\))/\1/i')
+version_patch=$(grep -i 'set(version_info_maint' CMakeLists.txt |sed 's/.*VERSION_INFO_MAINT_VERSION[[:space:]]*\([[:digit:]]*\))/\1/i')
version="${version_major}.${version_api}.${version_abi}.${version_patch}"
echo "Releasing version ${version}"