胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
9c5b30e7 2 parents 953ee8e1 cc811dfc

Merge branch 'srs.master'

内嵌 并排对比
正在显示 1 个修改的文件 包含 14 行增加 和 12 行删除
@@ -444,18 +444,20 @@ else @@ -444,18 +444,20 @@ else
444 echo "#undef SRS_AUTO_HTTP_CALLBACK" >> $SRS_AUTO_HEADERS_H 444 echo "#undef SRS_AUTO_HTTP_CALLBACK" >> $SRS_AUTO_HEADERS_H
445 fi 445 fi
446 446
447 -echo "link players to cherrypy static-dir"  
448 -rm -rf research/api-server/static-dir/players &&  
449 -ln -sf `pwd`/research/players research/api-server/static-dir/players &&  
450 -rm -f research/api-server/static-dir/crossdomain.xml &&  
451 -ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml &&  
452 -rm -rf research/api-server/static-dir/live &&  
453 -mkdir -p `pwd`/${SRS_OBJS}/nginx/html/live &&  
454 -ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live &&  
455 -rm -rf research/api-server/static-dir/forward &&  
456 -mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward &&  
457 -ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward  
458 -ret=$?; if [[ $ret -ne 0 ]]; then echo "link players to cherrypy static-dir failed, ret=$ret"; exit $ret; fi 447 +if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
  448 + echo "link players to cherrypy static-dir"
  449 + rm -rf research/api-server/static-dir/players &&
  450 + ln -sf `pwd`/research/players research/api-server/static-dir/players &&
  451 + rm -f research/api-server/static-dir/crossdomain.xml &&
  452 + ln -sf `pwd`/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml &&
  453 + rm -rf research/api-server/static-dir/live &&
  454 + mkdir -p `pwd`/${SRS_OBJS}/nginx/html/live &&
  455 + ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live &&
  456 + rm -rf research/api-server/static-dir/forward &&
  457 + mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward &&
  458 + ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward
  459 + ret=$?; if [[ $ret -ne 0 ]]; then echo "link players to cherrypy static-dir failed, ret=$ret"; exit $ret; fi
  460 +fi
459 461
460 ##################################################################################### 462 #####################################################################################
461 # generate demo index.html 463 # generate demo index.html