diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7ea8f39..8f516cc48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # ChangeLog +## 2.6.0 + - Implemented in-memory KVS for cache system. + - Added a link option for Glog shared library. + - Fix bugs of macros for command line interface. + - Updated LZ4 to v1.9.4. + ## 2.5.0 - Implemented flushResponse() function to continue the process after sending a response. - Updated glog to v0.6.0 diff --git a/src/tglobal.h b/src/tglobal.h index 6e34de6ad..eb7b75939 100644 --- a/src/tglobal.h +++ b/src/tglobal.h @@ -1,7 +1,7 @@ #pragma once constexpr auto TF_VERSION_STR = "2.6.0"; constexpr auto TF_VERSION_NUMBER = 0x020600; -constexpr auto TF_SRC_REVISION = 2747; +constexpr auto TF_SRC_REVISION = 2749; #include #include diff --git a/update_rev.sh b/update_rev.sh index bf78c5c7e..3a27ea6e4 100755 --- a/update_rev.sh +++ b/update_rev.sh @@ -13,9 +13,10 @@ function format echo "$(printf %x $1)" } -sed -i -e "s/auto TF_VERSION_STR.*/auto TF_VERSION_STR = \"${TF_VER_MAJ}\.${TF_VER_MIN}\.${TF_VER_PAT}\";/" $FILE_PATH -sed -i -e "s/auto TF_VERSION_NUMBER.*/auto TF_VERSION_NUMBER = 0x$(format ${TF_VER_MAJ})$(format ${TF_VER_MIN})$(format ${TF_VER_PAT});/" $FILE_PATH +sed -i -e "s/auto TF_VERSION_STR = \S*/auto TF_VERSION_STR = \"${TF_VER_MAJ}\.${TF_VER_MIN}\.${TF_VER_PAT}\";/" $FILE_PATH +sed -i -e "s/auto TF_VERSION_NUMBER = \S*/auto TF_VERSION_NUMBER = 0x$(format ${TF_VER_MAJ})$(format ${TF_VER_MIN})$(format ${TF_VER_PAT});/" $FILE_PATH sed -i -e "s/AssemblyVersionAttribute(\".*\")/AssemblyVersionAttribute(\"${TF_VER_MAJ}\.${TF_VER_MIN}\.${TF_VER_PAT}\")/" installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp +sed -i -e "s/set VERSION=\S*/set VERSION=${TF_VER_MAJ}\.${TF_VER_MIN}\.${TF_VER_PAT}/" installer/create_installer.bat [ which git >/dev/null 2>&1 ] && exit 1