winlin

remove osx support for 1.0.30

@@ -388,6 +388,7 @@ Supported operating systems and hardware: @@ -388,6 +388,7 @@ Supported operating systems and hardware:
388 388
389 ## History 389 ## History
390 390
  391 +* v1.0, 2015-03-17, remove the osx for 1.0.30.
391 * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. 392 * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
392 * <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong> 393 * <strong>v1.0, 2015-02-12, [1.0r2 release(1.0.27)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r2) released. 59507 lines.</strong>
393 * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27. 394 * v1.0, 2015-02-11, dev code HuKaiqun for 1.0.27.
@@ -299,6 +299,11 @@ function OSX_prepare() @@ -299,6 +299,11 @@ function OSX_prepare()
299 } 299 }
300 OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi 300 OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi
301 301
  302 +# by winlin, disable other system.
  303 +if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $SRS_EMBEDED_CPU = NO ]]; then
  304 + echo "only support Centos and Ubuntu, actual is `uname -s`"
  305 + exit 1
  306 +fi
302 307
303 ##################################################################################### 308 #####################################################################################
304 # st-1.9 309 # st-1.9
@@ -161,7 +161,6 @@ Options: @@ -161,7 +161,6 @@ Options:
161 161
162 Presets: 162 Presets:
163 --x86-x64 [default] for x86/x64 cpu, common pc and servers. 163 --x86-x64 [default] for x86/x64 cpu, common pc and servers.
164 - --osx for IOS(darwin) to build SRS.  
165 --pi for raspberry-pi(directly build), open features hls/ssl/static. 164 --pi for raspberry-pi(directly build), open features hls/ssl/static.
166 --cubie for cubieboard(directly build), open features except ffmpeg/nginx. 165 --cubie for cubieboard(directly build), open features except ffmpeg/nginx.
167 --arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild 166 --arm alias for --with-arm-ubuntu12, for ubuntu12, arm crossbuild
@@ -252,7 +251,6 @@ function parse_user_option() { @@ -252,7 +251,6 @@ function parse_user_option() {
252 --log-trace) SRS_LOG_TRACE=YES ;; 251 --log-trace) SRS_LOG_TRACE=YES ;;
253 252
254 --x86-x64) SRS_X86_X64=YES ;; 253 --x86-x64) SRS_X86_X64=YES ;;
255 - --osx) SRS_OSX=YES ;;  
256 --arm) SRS_ARM_UBUNTU12=YES ;; 254 --arm) SRS_ARM_UBUNTU12=YES ;;
257 --mips) SRS_MIPS_UBUNTU12=YES ;; 255 --mips) SRS_MIPS_UBUNTU12=YES ;;
258 --pi) SRS_PI=YES ;; 256 --pi) SRS_PI=YES ;;
@@ -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 1 32 #define VERSION_MAJOR 1
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 29 34 +#define VERSION_REVISION 30
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"