update version, add build date

winlin
Commit 263213d8b6f75e3887c28afcdc28d576149dc8a1 263213d8 1 parent 0516ddc7
trunk/3rdparty/CherryPy-3.2.4.zip
trunk/3rdparty/readme.txt
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/conf/srs.conf
trunk/configure
trunk/src/core/srs_core.hpp
trunk/src/core/srs_core_config.cpp
--- a/trunk/3rdparty/CherryPy-3.2.4.zip 0 → 100644
查看文件 @263213d
+++ b/trunk/3rdparty/CherryPy-3.2.4.zip 0 → 100644
查看文件 @263213d
--- a/trunk/3rdparty/readme.txt
查看文件 @263213d
+++ b/trunk/3rdparty/readme.txt
查看文件 @263213d
@@ -7,6 +7,9 @@ nginx-1.5.7.zip
 st-1.9.zip
     basic framework for srs.
+CherryPy-3.2.4.zip
+    sample api server for srs.
+
 ffmpeg-2.1.1.tar.gz
 yasm-1.2.0.tar.gz
 lame-3.99.5.tar.gz
@@ -38,4 +41,7 @@ links:
     yasm:
         http://yasm.tortall.net/
         http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz
+    cherrypy:
+        http://www.cherrypy.org/
+        https://pypi.python.org/pypi/CherryPy/3.2.4
--- a/trunk/auto/depends.sh 100644 → 100755
查看文件 @263213d
+++ b/trunk/auto/depends.sh 100644 → 100755
查看文件 @263213d
@@ -79,6 +79,31 @@ else
 fi
 #####################################################################################
+# cherrypy for http hooks callback, CherryPy-3.2.4
+#####################################################################################
+if [ $SRS_HTTP = YES ]; then
+    if [[ -f ${SRS_OBJS}/CherryPy-3.2.4/setup.py ]]; then
+        echo "CherryPy-3.2.4 is ok.";
+    else
+        echo "install CherryPy-3.2.4"; 
+        (
+            sudo rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} && 
+            unzip -q ../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 && 
+            sudo python setup.py install
+        )
+    fi
+    # check status
+    ret=$?; if [[ $ret -ne 0 ]]; then echo "build CherryPy-3.2.4 failed, ret=$ret"; exit $ret; fi
+    if [ ! -f ${SRS_OBJS}/nginx/sbin/nginx ]; then echo "build CherryPy-3.2.4 failed."; exit -1; fi
+fi
+
+if [ $SRS_HTTP = YES ]; then
+    echo "#define SRS_HTTP" >> $SRS_AUTO_HEADERS_H
+else
+    echo "#undef SRS_HTTP" >> $SRS_AUTO_HEADERS_H
+fi
+
+#####################################################################################
 # openssl, for rtmp complex handshake
 #####################################################################################
 if [ $SRS_SSL = YES ]; then
--- a/trunk/auto/options.sh 100644 → 100755
查看文件 @263213d
+++ b/trunk/auto/options.sh 100644 → 100755
查看文件 @263213d
@@ -5,11 +5,13 @@ help=no
 SRS_HLS=RESERVED
 SRS_SSL=RESERVED
 SRS_FFMPEG=RESERVED
+SRS_HTTP=RESERVED
 # TODO: remove the default to yes.
 SRS_HLS=YES
 SRS_SSL=YES
 SRS_FFMPEG=YES
+SRS_HTTP=YES
 opt=
@@ -28,10 +30,12 @@ do
         --with-ssl)                     SRS_SSL=YES               ;;
         --with-hls)                     SRS_HLS=YES               ;;
         --with-ffmpeg)                  SRS_FFMPEG=YES            ;;
+        --with-http)                    SRS_HTTP=YES              ;;
         --without-ssl)                  SRS_SSL=NO                ;;
         --without-hls)                  SRS_HLS=NO                ;;
         --without-ffmpeg)               SRS_FFMPEG=NO             ;;
+        --without-http)                 SRS_HTTP=NO               ;;
         *)
             echo "$0: error: invalid option \"$option\""
@@ -50,10 +54,13 @@ cat << END
   --with-ssl               enable rtmp complex handshake, requires openssl-devel installed.
                            to delivery h264 video and aac audio to flash player.
+  --with-http              enable http hooks, build cherrypy as demo api server.
+                           srs will call the http hooks, such as: on_connect.
   --with-hls               enable hls streaming, build nginx as http server for hls.
   --without-ssl            disable rtmp complex handshake.
   --without-hls            disable hls, rtmp streaming only.
+  --without-http           disable http, http hooks callback.
 END
@@ -73,6 +80,10 @@ if [ $SRS_FFMPEG = RESERVED ]; then
     echo "you must specifies the ffmpeg, see: ./configure --help";
     __check_ok=NO
 fi
+if [ $SRS_HTTP = RESERVED ]; then
+    echo "you must specifies the http, see: ./configure --help";
+    __check_ok=NO
+fi
 if [ $__check_ok = NO ]; then
     exit 1;
 fi
--- a/trunk/conf/srs.conf
查看文件 @263213d
+++ b/trunk/conf/srs.conf
查看文件 @263213d
@@ -81,14 +81,14 @@ vhost __defaultVhost__ {
 vhost dev {
     enabled         on;
     gop_cache       on;
-    hls             on;
+    hls             off;
     hls_path        ./objs/nginx/html;
     hls_fragment    5;
     hls_window      30;
-    forward         127.0.0.1:19350;
+    #forward         127.0.0.1:19350;
     #forward         127.0.0.1:1936;
     transcode {
-        enabled     on;
+        enabled     off;
         ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
         engine dev {
             enabled         off;
--- a/trunk/configure
查看文件 @263213d
+++ b/trunk/configure
查看文件 @263213d
@@ -15,6 +15,15 @@ BLACK="\\e[0m"
 # parse user options.
 . auto/options.sh
+# if specifies http, requires sudo to install the CherryPy.
+if [ $SRS_HTTP = YES ]; then
+    sudo echo "" >/dev/null 2>&1
+    ret=$?; if [[ 0 -ne $ret ]]; then echo 
+        "--with-http requires sudoer, ret=$ret"; 
+        exit $ret; 
+    fi
+fi
+
 # clean the exists
 if [[ -f Makefile ]]; then
     make clean
@@ -22,6 +31,8 @@ fi
 # generate the audo headers file.
 echo "#define SRS_CONFIGURE \"${SRS_CONFIGURE}\"" > $SRS_AUTO_HEADERS_H
+echo "#define SRS_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
+echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
 # apply user options.
 . auto/depends.sh
@@ -143,6 +154,11 @@ if [ $SRS_FFMPEG = YES ]; then
 else
     echo -e "${YELLOW}warning: without live stream transcoding over FFMPEG support${BLACK}"
 fi
+if [ $SRS_HTTP = YES ]; then
+    echo -e "${GREEN}http hooks callback over CherryPy is enabled${BLACK}"
+else
+    echo -e "${YELLOW}warning: without http hooks callback over CherryPy support${BLACK}"
+fi
 # mkdir dirs
 mkdir -p ${SRS_OBJS}/logs
--- a/trunk/src/core/srs_core.hpp 100644 → 100755
查看文件 @263213d
+++ b/trunk/src/core/srs_core.hpp 100644 → 100755
查看文件 @263213d
@@ -66,7 +66,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	(void)0
 // current release version
-#define RTMP_SIG_SRS_VERSION "0.5.0"
+#define RTMP_SIG_SRS_VERSION "0.8.0"
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"
 #define RTMP_SIG_SRS_ROLE "origin server"
--- a/trunk/src/core/srs_core_config.cpp 100644 → 100755
查看文件 @263213d
+++ b/trunk/src/core/srs_core_config.cpp 100644 → 100755
查看文件 @263213d
@@ -1182,7 +1182,7 @@ void SrsConfig::print_help(char** argv)
 	printf(RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION
 		" Copyright (c) 2013 winlin\n"
 		"Contributors: "RTMP_SIG_SRS_CONTRIBUTOR"\n"
-		"Configuration: "SRS_CONFIGURE"\n"
+		"Build: "SRS_BUILD_DATE" Configuration: "SRS_CONFIGURE"\n"
 		"Usage: %s [-h?vV] [-c <filename>]\n" 
 		"\n"
 		"Options:\n"