From d349a3dbda5b2566c822f569c8f27a0fb8593f8a Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 15 Mar 2015 08:15:04 +0800 Subject: [PATCH] update stable version check --- README.md | 2 +- trunk/src/core/srs_core.hpp | 6 +++++- trunk/src/main/srs_main_server.cpp | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5fcdffa67..28aa9c380 100755 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ PRIMARY response in NetConnection.connect and metadata. newbie questions, and generally make SRS that much better. About all PRIMARY, AUTHORS and CONTRIBUTORS, read -[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt). +[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/develop/AUTHORS.txt). A big THANK YOU goes to: * [chnvideo](chnvideo.com) co-founders([wiseyoung](mailto:wiseyoung@chnvideo.com), [trueice](mailto:trueice@chnvideo.com), [leijian](mailto:leijian@chnvideo.com)) for [big supports](https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Product#bigthanks). diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 6487b8637..3dbe43278 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 140 +#define VERSION_REVISION 141 // server info. #define RTMP_SIG_SRS_KEY "SRS" @@ -53,6 +53,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")" +// stable major version +#define VERSION_STABLE 1 +#define VERSION_STABLE_BRANCH __SRS_XSTR(VERSION_STABLE)".0release" + // internal macros, covert macro values to str, // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification #define __SRS_XSTR(v) __SRS_STR(v) diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 339b10e59..2d49cc096 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -207,9 +207,9 @@ void check_macro_features() srs_trace("writev limits write %d iovs a time", sysconf(_SC_IOV_MAX)); -#if VERSION_MAJOR > 1 - #warning "using develop SRS, please use release instead." - srs_warn("SRS %s is develop branch, please use %s instead", RTMP_SIG_SRS_VERSION, RTMP_SIG_SRS_RELEASE); +#if VERSION_MAJOR > VERSION_STABLE + #warning "current branch is not stable, please use stable branch instead." + srs_warn("SRS %s is not stable, please use stable branch %s instead", RTMP_SIG_SRS_VERSION, VERSION_STABLE_BRANCH); #endif #if defined(SRS_AUTO_STREAM_CASTER)