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-19 10:51:33 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d89d16ca1eb3b49047e74e12a3ec1e4533021dbe
d89d16ca
1 parent
2eeb289c
print the system info when startup main
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
21 行增加
和
9 行删除
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/configure
trunk/src/main/srs_main_server.cpp
trunk/auto/depends.sh
查看文件 @
d89d16c
...
...
@@ -3,6 +3,7 @@
# variables, parent script must set it:
# SRS_JOBS: the build jobs.
# SrsArmMakeOptions: the arm make options for ubuntu12(armhf, v7cpu)
# SRS_AUTO_HEADERS_H: the auto generated header file.
#####################################################################################
#####################################################################################
...
...
@@ -542,3 +543,6 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then
else
echo
"#undef SRS_ARM_UBUNTU12"
>>
$SRS_AUTO_HEADERS_H
fi
# new empty line to auto headers file.
echo
""
>>
$SRS_AUTO_HEADERS_H
...
...
trunk/auto/options.sh
查看文件 @
d89d16c
#!/bin/bash
# variables, parent script must set it:
# SRS_AUTO_HEADERS_H: the auto generated header file.
#####################################################################################
#####################################################################################
# parse user options, do this at first
...
...
trunk/configure
查看文件 @
d89d16c
...
...
@@ -19,6 +19,7 @@ BLACK="\\e[0m"
# srs features: SRS_SSL/SRS_HLS/SRS_FFMPEG/SRS_HTTP_CALLBACK/SRS_RESEARCH/SRS_UTEST
# build options: SRS_JOBS
#####################################################################################
SRS_AUTO_HEADERS_H
=
"
${
SRS_OBJS
}
/srs_auto_headers.hpp"
# parse options, exit with error when parse options invalid.
. auto/options.sh
...
...
@@ -28,15 +29,18 @@ if [[ -f Makefile ]]; then
make clean
fi
#####################################################################################
# generate auto headers file, depends on the finished of options.sh
#####################################################################################
# write user options to headers
SRS_AUTO_HEADERS_H
=
"
${
SRS_OBJS
}
/srs_auto_headers.hpp"
echo
"#define SRS_CONFIGURE
\"
${
SRS_CONFIGURE
}
\"
"
>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_BUILD_DATE
\"
`
date
\"
+%Y-%m-%d %H:%M:%S
\"
`
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_BUILD_TS
\"
`
date +%s
`
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_BUILD_DATE
\"
`
date
\"
+%Y-%m-%d %H:%M:%S
\"
`
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_UNAME
\"
`
uname -a
`
\"
"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_CONFIGURE
\"
${
SRS_CONFIGURE
}
\"
"
>>
$SRS_AUTO_HEADERS_H
# new empty line to auto headers file.
echo
""
>>
$SRS_AUTO_HEADERS_H
#####################################################################################
# generate auto headers file, depends on the finished of options.sh
#####################################################################################
# the arm-ubuntu12 options for make for depends
SrsArmCC
=
"arm-linux-gnueabi-gcc"
SrsArmGCC
=
"arm-linux-gnueabi-gcc"
...
...
@@ -48,9 +52,6 @@ SrsArmRANDLIB="arm-linux-gnueabi-ranlib"
# apply user options.
. auto/depends.sh
# new empty line to auto headers file.
echo
""
>>
$SRS_AUTO_HEADERS_H
#####################################################################################
# generate Makefile.
#####################################################################################
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
d89d16c
...
...
@@ -80,6 +80,10 @@ int main(int argc, char** argv)
return
-
1
;
#endif
#endif
srs_trace
(
"uname: "
SRS_UNAME
);
srs_trace
(
"build: %s, %s"
,
SRS_BUILD_DATE
,
srs_is_little_endian
()
?
"little-endian"
:
"big-endian"
);
srs_trace
(
"configure: "
SRS_CONFIGURE
);
if
((
ret
=
_srs_server
->
initialize
())
!=
ERROR_SUCCESS
)
{
return
ret
;
...
...
请
注册
或
登录
后发表评论