winlin

update stable version check

@@ -205,7 +205,7 @@ PRIMARY response in NetConnection.connect and metadata. @@ -205,7 +205,7 @@ PRIMARY response in NetConnection.connect and metadata.
205 newbie questions, and generally make SRS that much better. 205 newbie questions, and generally make SRS that much better.
206 206
207 About all PRIMARY, AUTHORS and CONTRIBUTORS, read 207 About all PRIMARY, AUTHORS and CONTRIBUTORS, read
208 -[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/master/AUTHORS.txt). 208 +[AUTHORS.txt](https://github.com/winlinvip/simple-rtmp-server/blob/develop/AUTHORS.txt).
209 209
210 A big THANK YOU goes to: 210 A big THANK YOU goes to:
211 * [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). 211 * [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).
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 140 34 +#define VERSION_REVISION 141
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
@@ -53,6 +53,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -53,6 +53,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
53 #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) 53 #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION)
54 #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")" 54 #define RTMP_SIG_SRS_SERVER RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION"("RTMP_SIG_SRS_CODE")"
55 55
  56 +// stable major version
  57 +#define VERSION_STABLE 1
  58 +#define VERSION_STABLE_BRANCH __SRS_XSTR(VERSION_STABLE)".0release"
  59 +
56 // internal macros, covert macro values to str, 60 // internal macros, covert macro values to str,
57 // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification 61 // see: read https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification
58 #define __SRS_XSTR(v) __SRS_STR(v) 62 #define __SRS_XSTR(v) __SRS_STR(v)
@@ -207,9 +207,9 @@ void check_macro_features() @@ -207,9 +207,9 @@ void check_macro_features()
207 207
208 srs_trace("writev limits write %d iovs a time", sysconf(_SC_IOV_MAX)); 208 srs_trace("writev limits write %d iovs a time", sysconf(_SC_IOV_MAX));
209 209
210 -#if VERSION_MAJOR > 1  
211 - #warning "using develop SRS, please use release instead."  
212 - srs_warn("SRS %s is develop branch, please use %s instead", RTMP_SIG_SRS_VERSION, RTMP_SIG_SRS_RELEASE); 210 +#if VERSION_MAJOR > VERSION_STABLE
  211 + #warning "current branch is not stable, please use stable branch instead."
  212 + srs_warn("SRS %s is not stable, please use stable branch %s instead", RTMP_SIG_SRS_VERSION, VERSION_STABLE_BRANCH);
213 #endif 213 #endif
214 214
215 #if defined(SRS_AUTO_STREAM_CASTER) 215 #if defined(SRS_AUTO_STREAM_CASTER)