Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-03-20 15:15:46 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ef7853d7f7f4e211d5651a98009f2c68efb2352e
ef7853d7
1 parent
8239174e
fix demo bug, remove the api server static-dir when link to nginx
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
4 行增加
和
3 行删除
trunk/auto/depends.sh
trunk/auto/depends.sh
查看文件 @
ef7853d
...
...
@@ -356,16 +356,17 @@ else
fi
echo
"link players to cherrypy static-dir"
rm -f research/api-server/static-dir/players
&&
rm -
r
f research/api-server/static-dir/players
&&
ln -sf
`
pwd
`
/research/players research/api-server/static-dir/players
&&
rm -f research/api-server/static-dir/crossdomain.xml
&&
ln -sf
`
pwd
`
/research/players/crossdomain.xml research/api-server/static-dir/crossdomain.xml
&&
rm -f research/api-server/static-dir/live
&&
rm -
r
f research/api-server/static-dir/live
&&
mkdir -p
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/live
&&
ln -sf
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/live research/api-server/static-dir/live
&&
rm -f research/api-server/static-dir/forward
&&
rm -
r
f research/api-server/static-dir/forward
&&
mkdir -p
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/forward
&&
ln -sf
`
pwd
`
/
${
SRS_OBJS
}
/nginx/html/forward research/api-server/static-dir/forward
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
echo
"link players to cherrypy static-dir failed, ret=
$ret
"
;
exit
$ret
;
fi
# only when the nginx is ok,
# if api-server not enalbed, use nginx as demo.
...
...
请
注册
或
登录
后发表评论