mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Upgrade jquery from 1.10.2 to 1.12.2 (#3571)
--------- Co-authored-by: chundonglinlin <chundonglinlin@163.com>
This commit is contained in:
parent
cb44e81d83
commit
30c2f50cae
32 changed files with 29 additions and 81 deletions
|
@ -353,41 +353,6 @@ if [[ ! -f $SRS_WORKDIR/conf/server.key || ! -f $SRS_WORKDIR/conf/server.crt ]];
|
|||
echo "Generate test-only self-sign certificate files"
|
||||
fi
|
||||
|
||||
#####################################################################################
|
||||
# cherrypy for http hooks callback, CherryPy-3.2.4
|
||||
#####################################################################################
|
||||
# TODO: FIXME: Replace by Go.
|
||||
if [[ $SRS_CHERRYPY == YES ]]; then
|
||||
# Detect python or python2
|
||||
python --version >/dev/null 2>&1 && SYS_PYTHON=python;
|
||||
python2 --version >/dev/null 2>&1 && SYS_PYTHON=python2;
|
||||
# Install cherrypy for api server.
|
||||
if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/CherryPy-3.2.4/setup.py ]]; then
|
||||
echo "CherryPy-3.2.4 is ok.";
|
||||
else
|
||||
echo "Installing CherryPy-3.2.4";
|
||||
(
|
||||
rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS}/${SRS_PLATFORM} &&
|
||||
unzip -q ../../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 &&
|
||||
$SYS_PYTHON setup.py install --user --prefix=''
|
||||
)
|
||||
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}/${SRS_PLATFORM}/CherryPy-3.2.4/setup.py ]; then echo "build CherryPy-3.2.4 failed."; exit -1; fi
|
||||
|
||||
echo "Link players to cherrypy static-dir"
|
||||
rm -rf research/api-server/static-dir/players &&
|
||||
ln -sf $SRS_WORKDIR/research/players research/api-server/static-dir/players &&
|
||||
rm -rf research/api-server/static-dir/live &&
|
||||
mkdir -p $SRS_WORKDIR/${SRS_OBJS}/nginx/html/live &&
|
||||
ln -sf $SRS_WORKDIR/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live &&
|
||||
rm -rf research/api-server/static-dir/forward &&
|
||||
mkdir -p $SRS_WORKDIR/${SRS_OBJS}/nginx/html/forward &&
|
||||
ln -sf $SRS_WORKDIR/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward
|
||||
ret=$?; if [[ $ret -ne 0 ]]; then echo "Warning: Ignore error to link players to cherrypy static-dir."; fi
|
||||
fi
|
||||
|
||||
#####################################################################################
|
||||
# openssl, for rtmp complex handshake and HLS encryption.
|
||||
#####################################################################################
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue