remove supports for OSX. 2.0.1.

winlin
Commit d24e2fd0cc5bd82bc932d4c2755ae091ec1dcdc5 d24e2fd0 1 parent d9b12b15
README.md
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/research/st/Makefile
trunk/src/app/srs_app_config.cpp
trunk/src/core/srs_core.hpp
--- a/README.md
查看文件 @d24e2fd
+++ b/README.md
查看文件 @d24e2fd
@@ -201,6 +201,7 @@ Supported operating systems and hardware:
 * 2013-10-17, Created.<br/>
 ## History
+* v1.0, 2014-10-18, remove supports for OSX. 2.0.1.
 * v1.0, 2014-10-16, revert github srs README to English. 2.0.0.
 * <strong>v1.0, 2014-10-09, [1.0 beta(1.0.0)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.beta) released. 59316 lines.</strong>
 * v1.0, 2014-10-08, fix [#151](https://github.com/winlinvip/simple-rtmp-server/issues/151), always reap ts whatever audio or video packet. 0.9.223.
--- a/trunk/auto/depends.sh
查看文件 @d24e2fd
+++ b/trunk/auto/depends.sh
查看文件 @d24e2fd
@@ -214,91 +214,6 @@ function Centos_prepare()
     return 0
 }
 Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "CentOS prepare failed, ret=$ret"; exit $ret; fi
-#####################################################################################
-# for OSX, auto install tools by brew
-#####################################################################################
-OS_IS_OSX=NO
-function OSX_prepare()
-{
-    SYS_NAME=`uname -s`
-    if [ $SYS_NAME != Darwin ]; then
-        echo "This is not Darwin OSX"
-        return 0;
-    fi
-
-    OS_IS_OSX=YES
-    echo "OSX detected, install tools if needed"
-    
-    gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-        echo "install gcc"
-        require_sudoer "sudo brew install gcc"
-        sudo brew install gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-        echo "install gcc success"
-    fi
-    
-    g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-        echo "install gcc-c++"
-        require_sudoer "sudo brew install gcc-c++"
-        sudo brew install gcc-c++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-        echo "install gcc-c++ success"
-    fi
-    
-    make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-        echo "install make"
-        require_sudoer "sudo brew install make"
-        sudo brew install make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-        echo "install make success"
-    fi
-    
-    patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-        echo "install patch"
-        require_sudoer "sudo brew install patch"
-        sudo brew install patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-        echo "install patch success"
-    fi
-    
-    if [ $SRS_FFMPEG_TOOL = YES ]; then
-        automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-            echo "install automake"
-            require_sudoer "sudo brew install automake"
-            sudo brew install automake; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install automake success"
-        fi
-        
-        autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-            echo "install autoconf"
-            require_sudoer "sudo brew install autoconf"
-            sudo brew install autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install autoconf success"
-        fi
-        
-        libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
-            echo "install libtool"
-            require_sudoer "sudo brew install libtool"
-            sudo brew install libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install libtool success"
-        fi
-        
-        if [[ ! -f /usr/include/pcre.h ]]; then
-            echo "install pcre-devel"
-            require_sudoer "sudo brew install pcre-devel"
-            sudo brew install pcre-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install pcre-devel success"
-        fi
-        
-        if [[ ! -f /usr/include/zlib.h ]]; then
-            echo "install zlib-devel"
-            require_sudoer "sudo brew install zlib-devel"
-            sudo brew install zlib-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
-            echo "install zlib-devel success"
-        fi
-    fi
-    
-    echo "OSX install tools success"
-    return 0
-}
-OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi
-
 #####################################################################################
 # st-1.9
@@ -323,9 +238,6 @@ if [ $SRS_EMBEDED_CPU = YES ]; then
         )
     fi
 else
-    if [ $SRS_OSX = YES ]; then 
-        _ST_MAKE=darwin-debug
-    fi
     if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
         echo "st-1.9t is ok.";
     else
@@ -351,21 +263,8 @@ if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "build st-1.9 static lib failed.";
 #####################################################################################
 # check the arm flag file, if flag changed, need to rebuild the st.
 if [ $SRS_HTTP_PARSER = YES ]; then
-    # for osx(darwin), donot use sed.
-    if [ $SRS_OSX = YES ]; then 
-        if [[ -f ${SRS_OBJS}/hp/http_parser.h && -f ${SRS_OBJS}/hp/libhttp_parser.a ]]; then
-            echo "http-parser-2.1 is ok.";
-        else
-            echo "build http-parser-2.1 for osx(darwin)";
-            (
-                rm -rf ${SRS_OBJS}/http-parser-2.1 && cd ${SRS_OBJS} && unzip -q ../3rdparty/http-parser-2.1.zip && 
-                cd http-parser-2.1 && 
-                make package &&
-                cd .. && rm -rf hp && ln -sf http-parser-2.1 hp
-            )
-        fi
     # ok, arm specified, if the flag filed does not exists, need to rebuild.
-    elif [ $SRS_EMBEDED_CPU = YES ]; then
+    if [ $SRS_EMBEDED_CPU = YES ]; then
         if [[ -f ${SRS_OBJS}/_flag.st.hp.tmp && -f ${SRS_OBJS}/hp/http_parser.h && -f ${SRS_OBJS}/hp/libhttp_parser.a ]]; then
             echo "http-parser-2.1 for arm is ok.";
         else
@@ -570,18 +469,6 @@ fi
 # extra configure options
 CONFIGURE_TOOL="./config"
 EXTRA_CONFIGURE=""
-if [ $SRS_OSX = YES ]; then
-    CONFIGURE_TOOL="./Configure"
-    arch=`uname -m` && echo "OSX $arch";
-    if [ $arch = x86_64 ]; then
-        echo "configure 64bit openssl";
-        EXTRA_CONFIGURE=darwin64-x86_64-cc
-    else
-        echo "configure 32bit openssl";
-        EXTRA_CONFIGURE=darwin-i386-cc
-    fi
-    echo "openssl extra config: $CONFIGURE_TOOL $EXTRA_CONFIGURE"
-fi
 if [ $SRS_EMBEDED_CPU = YES ]; then
     CONFIGURE_TOOL="./Configure"
 fi
--- a/trunk/auto/options.sh 100644 → 100755
查看文件 @d24e2fd
+++ b/trunk/auto/options.sh 100644 → 100755
查看文件 @d24e2fd
@@ -63,8 +63,6 @@ SRS_USE_SYS_SSL=NO
 # presets
 # for x86/x64 pc/servers
 SRS_X86_X64=NO
-# for ios(darwin)
-SRS_OSX=NO
 # armhf(v7cpu) built on ubuntu12
 SRS_ARM_UBUNTU12=NO
 # mips built on ubuntu12
@@ -161,7 +159,6 @@ Options:
 Presets:
   --x86-x64                 [default] for x86/x64 cpu, common pc and servers.
-  --osx                     for IOS(darwin) to build SRS.
   --pi                      for raspberry-pi(directly build), open features hls/ssl/static.
   --cubie                   for cubieboard(directly build), open features except ffmpeg/nginx.
   --arm                     alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild
@@ -252,7 +249,6 @@ function parse_user_option() {
         --log-trace)                    SRS_LOG_TRACE=YES           ;;
         --x86-x64)                      SRS_X86_X64=YES             ;;
-        --osx)                          SRS_OSX=YES                 ;;
         --arm)                          SRS_ARM_UBUNTU12=YES        ;;
         --mips)                         SRS_MIPS_UBUNTU12=YES       ;;
         --pi)                           SRS_PI=YES                  ;;
@@ -322,9 +318,7 @@ function apply_user_presets() {
                                             if [ $SRS_PI = NO ]; then
                                                 if [ $SRS_CUBIE = NO ]; then
                                                     if [ $SRS_X86_X64 = NO ]; then
-                                                        if [ $SRS_OSX = NO ]; then
-                                                            SRS_X86_X64=YES; opt="--x86-x64 $opt";
-                                                        fi
+														SRS_X86_X64=YES; opt="--x86-x64 $opt";
                                                     fi
                                                 fi
                                             fi
@@ -597,34 +591,7 @@ function apply_user_presets() {
         SRS_GPROF=NO
         SRS_STATIC=NO
     fi
-
-    # if osx dev specified, open main server features.
-    if [ $SRS_OSX = YES ]; then
-        SRS_HLS=YES
-        SRS_DVR=YES
-        SRS_NGINX=NO
-        SRS_SSL=YES
-        SRS_FFMPEG_TOOL=NO
-        SRS_TRANSCODE=YES
-        SRS_INGEST=YES
-        SRS_STAT=NO
-        SRS_HTTP_PARSER=YES
-        SRS_HTTP_CALLBACK=YES
-        SRS_HTTP_SERVER=YES
-        SRS_HTTP_API=YES
-        SRS_LIBRTMP=NO
-        SRS_RESEARCH=NO
-        SRS_UTEST=NO
-        SRS_GPERF=NO
-        SRS_GPERF_MC=NO
-        SRS_GPERF_MP=NO
-        SRS_GPERF_CP=NO
-        SRS_GPROF=NO
-        SRS_STATIC=NO
-    fi
-
-
-
+	
     # for srs demo
     if [ $SRS_DEMO = YES ]; then
         SRS_HLS=YES
@@ -812,24 +779,6 @@ function check_option_conflicts() {
             echo "x86/x64 should never use static, see: ./configure --help"; __check_ok=NO;
         fi
     fi
-
-    # for darwin, not support stat yet.
-    if [ $SRS_OSX = YES ]; then
-        if [ $SRS_STAT = YES ]; then
-            echo "osx should never use stat, see: ./configure --help"; __check_ok=NO;
-        fi
-    fi
-    
-    # for darwin, must use --osx, vice versa
-    if [ $SRS_OSX = YES ]; then 
-        if [ `uname -s` != Darwin ]; then
-            echo "--osx is for darwin(your os is not), see: ./configure --help"; __check_ok=NO;
-        fi
-    else
-        if [ `uname -s` = Darwin ]; then
-            echo "use --osx for darwin, see: ./configure --help"; __check_ok=NO;
-        fi
-    fi
     # TODO: FIXME: check more os.
--- a/trunk/research/st/Makefile
查看文件 @d24e2fd
+++ b/trunk/research/st/Makefile
查看文件 @d24e2fd
@@ -112,6 +112,7 @@ OBJS        = $(TARGETDIR)/sched.o 	\
 OBJS        += $(EXTRA_OBJS)
 SRS    		= $(TARGETDIR)/srs
+linux-debug: all
 all: $(TARGETDIR) $(SRS)
 $(TARGETDIR):
--- a/trunk/src/app/srs_app_config.cpp
查看文件 @d24e2fd
+++ b/trunk/src/app/srs_app_config.cpp
查看文件 @d24e2fd
@@ -1166,7 +1166,7 @@ void SrsConfig::print_help(char** argv)
 {
     printf(
         RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION" "RTMP_SIG_SRS_COPYRIGHT"\n" 
-        "license: "RTMP_SIG_SRS_LICENSE"\n"
+        "License: "RTMP_SIG_SRS_LICENSE"\n"
         "Primary Authors: "RTMP_SIG_SRS_PRIMARY_AUTHROS"\n"
         "Build: "SRS_AUTO_BUILD_DATE" Configuration:"SRS_AUTO_USER_CONFIGURE"\n"
         "Features:"SRS_AUTO_CONFIGURE"\n""\n"
--- a/trunk/src/core/srs_core.hpp
查看文件 @d24e2fd
+++ b/trunk/src/core/srs_core.hpp
查看文件 @d24e2fd
@@ -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 "0"
+#define VERSION_REVISION "1"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"