From e399a9ea2d7d2328a31012f6281d1bfee973b2c0 Mon Sep 17 00:00:00 2001 From: "Alan M. Carroll" Date: Tue, 21 Jan 2020 17:23:44 -0600 Subject: [PATCH] Fix version, version update script. --- swoc++/include/swoc/swoc_version.h | 5 +++-- swoc++/swoc++.part | 2 +- tools/update-version.sh | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/swoc++/include/swoc/swoc_version.h b/swoc++/include/swoc/swoc_version.h index 1800d03..b3f9963 100644 --- a/swoc++/include/swoc/swoc_version.h +++ b/swoc++/include/swoc/swoc_version.h @@ -37,6 +37,7 @@ namespace swoc { -static constexpr unsigned MAJOR_VERSION = 1 static constexpr unsigned MINOR_VERSION = 0 static constexpr unsigned POINT_VERSION = 9 - +static constexpr unsigned MAJOR_VERSION = 1; +static constexpr unsigned MINOR_VERSION = 0; +static constexpr unsigned POINT_VERSION = 9; } // namespace swoc diff --git a/swoc++/swoc++.part b/swoc++/swoc++.part index 9b3bb5d..8d34df8 100644 --- a/swoc++/swoc++.part +++ b/swoc++/swoc++.part @@ -1,5 +1,5 @@ Import("*") -PartVersion("1.0.8") +PartVersion("1.0.9") PartName("swoc++") files = [ diff --git a/tools/update-version.sh b/tools/update-version.sh index 2413f8d..c12569b 100644 --- a/tools/update-version.sh +++ b/tools/update-version.sh @@ -6,11 +6,12 @@ if [ -z "$3" ] ; then fi # Header -sed -i swoc++/include/swoc/swoc_version.h --expr "s/\(MAJOR_VERSION *= *\).*\$/\\1$1/" -sed -i swoc++/include/swoc/swoc_version.h --expr "s/\(MINOR_VERSION *= *\).*\$/\\1$2/" -sed -i swoc++/include/swoc/swoc_version.h --expr "s/\(POINT_VERSION *= *\).*\$/\\1$3/" +sed -i swoc++/include/swoc/swoc_version.h --expr "s/\(MAJOR_VERSION *= *\).*\$/\\1$1;/" +sed -i swoc++/include/swoc/swoc_version.h --expr "s/\(MINOR_VERSION *= *\).*\$/\\1$2;/" +sed -i swoc++/include/swoc/swoc_version.h --expr "s/\(POINT_VERSION *= *\).*\$/\\1$3;/" sed -i doc/conf.py --expr "s/release = .*\$/release = \"$1.$2.$3\"/" sed -i doc/Doxyfile --expr "s/\(PROJECT_NUMBER *= *\).*\$/\\1\"$1.$2.$3\"/" sed -i swoc++/CMakeLists.txt --expr "s/\(LIBSWOC_VERSION *\)\"[^\"]*\"/\\1\"$1.$2.$3\"/" +sed -i swoc++/swoc++.part --expr "s/PartVersion(\"[0-9.]*\")/PartVersion(\"$1.$2.$3\")/"