diff --git a/README.md b/README.md index 772c74b5b..65c1c01b7 100755 --- a/README.md +++ b/README.md @@ -191,6 +191,7 @@ Other documents: ## V4 changes +* v4.0, 2021-04-24, Disable CherryPy by --cherrypy=off. 4.0.90 * v4.0, 2021-04-01, RTC: Refine TWCC and SDP exchange. 4.0.88 * v4.0, 2021-03-24, RTC: Support WebRTC re-publish stream. 4.0.87 * v4.0, 2021-03-24, RTC: Use fast parse TWCC-ID, ignore in packet parsing. 4.0.86 diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 800b1e424..d21b717ae 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -46,7 +46,7 @@ SRS_HTTP_API=YES SRS_HTTP_CORE=YES SRS_HLS=YES SRS_DVR=YES -SRS_CHERRYPY=YES +SRS_CHERRYPY=NO # ################################################################ # FFmpeg stub is the stub code in SRS for ingester or encoder. diff --git a/trunk/configure b/trunk/configure index 76c7cf020..9c45da263 100755 --- a/trunk/configure +++ b/trunk/configure @@ -505,7 +505,6 @@ doclean: (cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players) clean: clean_srs clean_modules - @echo "You can clean each some components, see make help" destroy: (cd ${SRS_OBJS_DIR} && rm -rf ${SRS_PLATFORM}) @@ -567,7 +566,7 @@ echo "" >> ${SRS_WORKDIR}/${SRS_MAKEFILE} cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} server: _prepare_dir - @echo "Build the srs(simple rtmp server) over ST(state-threads)" + @echo "Build the SRS server" \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs END @@ -786,20 +785,22 @@ done # Do cleanup when configure done. ##################################################################################### if [[ $SRS_CLEAN == YES && -f Makefile ]]; then - echo "Do full cleanup, you can disable it by: --clean=off" + #echo "Do full cleanup, you can disable it by: --clean=off" make clean fi ##################################################################################### # next step ##################################################################################### -echo "" -echo "You can run 3rdparty applications:" -if [ $SRS_HTTP_CALLBACK = YES ]; then - echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" +if [[ $SRS_CHERRYPY == YES ]]; then + echo "" + echo "You can run 3rdparty applications:" + if [ $SRS_HTTP_CALLBACK = YES ]; then + echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" + fi fi echo "" echo "You can build SRS:" -echo "\" make \" to build the srs(simple rtmp server)." -echo "\" make help \" to get the usage of make" +echo "\" make \" to build the SRS server" +echo "\" make help \" to get some help" diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index c9ecf224b..8a2e0bb42 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -26,6 +26,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 89 +#define VERSION_REVISION 90 #endif