diff --git a/AUTHORS.txt b/AUTHORS.txt index 89d65917f..6755f273b 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -52,4 +52,5 @@ CONTRIBUTORS ordered by first contribution. * xialixin * alphonsetai * Michael.Ma -* lam2003 \ No newline at end of file +* lam2003 +* runner365 \ No newline at end of file diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 9c3514942..13ffe88b1 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -510,9 +510,9 @@ apply_user_detail_options function regenerate_options() { # save all config options to macro to write to auto headers file - SRS_AUTO_USER_CONFIGURE="$opt" + SRS_AUTO_USER_CONFIGURE=`echo $opt` # regenerate the options for default values. -SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}" + SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}" if [ $SRS_HLS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hls"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hls"; fi if [ $SRS_HDS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hds"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hds"; fi if [ $SRS_DVR = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-dvr"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-dvr"; fi diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 0fa544fab..04c1f2032 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -3391,9 +3391,7 @@ srs_error_t SrsConfig::parse_argv(int& i, char** argv) void SrsConfig::print_help(char** argv) { printf( - RTMP_SIG_SRS_SERVER ", " RTMP_SIG_SRS_URL ", licensed under " RTMP_SIG_SRS_LICENSE - ", built at " SRS_AUTO_BUILD_DATE ", configured by " SRS_AUTO_USER_CONFIGURE - ", which means " SRS_AUTO_CONFIGURE "\n""\n" + "%s, %s, %s, created by %s\n\n" "Usage: %s <-h?vVgG>|<[-t] -c filename>\n" "Options:\n" " -?, -h : Show this help and exit 0.\n" @@ -3403,9 +3401,12 @@ void SrsConfig::print_help(char** argv) " -c filename : Use config file to start server.\n" "For example:\n" " %s -v\n" - " %s -t -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n" - " %s -c " SRS_CONF_DEFAULT_COFNIG_FILE "\n", - argv[0], argv[0], argv[0], argv[0]); + " %s -t -c %s\n" + " %s -c %s\n", + RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_URL, RTMP_SIG_SRS_LICENSE, + RTMP_SIG_SRS_AUTHORS, + argv[0], argv[0], argv[0], SRS_CONF_DEFAULT_COFNIG_FILE, + argv[0], SRS_CONF_DEFAULT_COFNIG_FILE); } srs_error_t SrsConfig::parse_file(const char* filename) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index fe5e94add..d1febe177 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -41,7 +41,8 @@ #define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_CODE "OuXuli" #define RTMP_SIG_SRS_URL "https://github.com/ossrs/srs" -#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" +#define RTMP_SIG_SRS_LICENSE "MIT" +#define RTMP_SIG_SRS_AUTHORS "winlin,wenjie,runner365" #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 ")" diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index c78737802..190346e89 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -124,6 +124,7 @@ srs_error_t do_main(int argc, char** argv) // config already applied to log. srs_trace("%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); + srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS); srs_trace("contributors: %s", SRS_AUTO_CONSTRIBUTORS); srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s", _srs_config->cwd().c_str(), cwd.c_str(), SRS_AUTO_BUILD_DATE, SRS_AUTO_USER_CONFIGURE, SRS_AUTO_UNAME); diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index bec1ad35c..a530316cd 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -2399,6 +2399,7 @@ srs_error_t SrsRtmpServer::response_connect_app(SrsRequest *req, const char* ser data->set("srs_license", SrsAmf0Any::str(RTMP_SIG_SRS_LICENSE)); data->set("srs_url", SrsAmf0Any::str(RTMP_SIG_SRS_URL)); data->set("srs_version", SrsAmf0Any::str(RTMP_SIG_SRS_VERSION)); + data->set("srs_authors", SrsAmf0Any::str(RTMP_SIG_SRS_AUTHORS)); if (server_ip) { data->set("srs_server_ip", SrsAmf0Any::str(server_ip));