胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
28517849 1 parent f6c8e02c

refine typo

内嵌 并排对比
正在显示 11 个修改的文件 包含 270 行增加 和 314 行删除
@@ -17,7 +17,7 @@ FILE=${SRS_OBJS}/${SRS_MAKEFILE} @@ -17,7 +17,7 @@ FILE=${SRS_OBJS}/${SRS_MAKEFILE}
17 17
18 APP_TARGET="${SRS_OBJS_DIR}/${APP_NAME}" 18 APP_TARGET="${SRS_OBJS_DIR}/${APP_NAME}"
19 19
20 -echo "generate app ${APP_NAME} depends..."; 20 +echo "Generating app ${APP_NAME} depends.";
21 21
22 echo "# build ${APP_TARGET}" >> ${FILE} 22 echo "# build ${APP_TARGET}" >> ${FILE}
23 # generate the binary depends, for example: 23 # generate the binary depends, for example:
@@ -52,7 +52,7 @@ for item in ${MODULE_OBJS[*]}; do @@ -52,7 +52,7 @@ for item in ${MODULE_OBJS[*]}; do
52 done 52 done
53 echo "" >> ${FILE} 53 echo "" >> ${FILE}
54 54
55 -echo "generate app ${APP_NAME} link..."; 55 +echo "Generating app ${APP_NAME} link.";
56 56
57 # genereate the actual link command, for example: 57 # genereate the actual link command, for example:
58 # $(LINK) -o objs/srs objs/src/core/srs_core.o -ldl 58 # $(LINK) -o objs/srs objs/src/core/srs_core.o -ldl
@@ -89,4 +89,4 @@ done @@ -89,4 +89,4 @@ done
89 echo -n "${LINK_OPTIONS}" >> ${FILE} 89 echo -n "${LINK_OPTIONS}" >> ${FILE}
90 echo "" >> ${FILE} 90 echo "" >> ${FILE}
91 91
92 -echo -n "generate app ${APP_NAME} ok"; echo '!'; 92 +echo -n "Generate app ${APP_NAME} ok"; echo '!';
@@ -25,8 +25,8 @@ function require_sudoer() @@ -25,8 +25,8 @@ function require_sudoer()
25 } 25 }
26 26
27 # TODO: check gcc/g++ 27 # TODO: check gcc/g++
28 -echo "check gcc/g++/gdb/make"  
29 -echo "depends tools are ok" 28 +echo "Checking gcc/g++/gdb/make."
  29 +echo "Required tools are ok."
30 ##################################################################################### 30 #####################################################################################
31 # for Ubuntu, auto install tools by apt-get 31 # for Ubuntu, auto install tools by apt-get
32 ##################################################################################### 32 #####################################################################################
@@ -34,7 +34,7 @@ OS_IS_UBUNTU=NO @@ -34,7 +34,7 @@ OS_IS_UBUNTU=NO
34 function Ubuntu_prepare() 34 function Ubuntu_prepare()
35 { 35 {
36 if [ $SRS_CUBIE = YES ]; then 36 if [ $SRS_CUBIE = YES ]; then
37 - echo "for cubieboard, use ubuntu prepare" 37 + echo "For cubieboard, please use ubuntu prepare."
38 else 38 else
39 uname -v|grep Ubuntu >/dev/null 2>&1 39 uname -v|grep Ubuntu >/dev/null 2>&1
40 ret=$?; if [[ 0 -ne $ret ]]; then 40 ret=$?; if [[ 0 -ne $ret ]]; then
@@ -49,97 +49,97 @@ function Ubuntu_prepare() @@ -49,97 +49,97 @@ function Ubuntu_prepare()
49 # cross build for arm, install the cross build tool chain. 49 # cross build for arm, install the cross build tool chain.
50 if [ $SRS_ARM_UBUNTU12 = YES ]; then 50 if [ $SRS_ARM_UBUNTU12 = YES ]; then
51 $SrsArmCC --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 51 $SrsArmCC --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
52 - echo "install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi" 52 + echo "Installing gcc-arm-linux-gnueabi g++-arm-linux-gnueabi."
53 require_sudoer "sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi" 53 require_sudoer "sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi"
54 sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 54 sudo apt-get install -y --force-yes gcc-arm-linux-gnueabi g++-arm-linux-gnueabi; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
55 - echo "install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi success" 55 + echo "The gcc-arm-linux-gnueabi g++-arm-linux-gnueabi are installed."
56 fi 56 fi
57 fi 57 fi
58 58
59 # cross build for mips, user must installed the tool chain. 59 # cross build for mips, user must installed the tool chain.
60 if [ $SRS_MIPS_UBUNTU12 = YES ]; then 60 if [ $SRS_MIPS_UBUNTU12 = YES ]; then
61 $SrsArmCC --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 61 $SrsArmCC --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
62 - echo "user must install the tool chain: $SrsArmCC" 62 + echo "You must install the tool chain: $SrsArmCC"
63 return 2 63 return 2
64 fi 64 fi
65 fi 65 fi
66 66
67 OS_IS_UBUNTU=YES 67 OS_IS_UBUNTU=YES
68 - echo "Ubuntu detected, install tools if needed" 68 + echo "Installing tools for Ubuntu."
69 69
70 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 70 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
71 - echo "install gcc" 71 + echo "Installing gcc."
72 require_sudoer "sudo apt-get install -y --force-yes gcc" 72 require_sudoer "sudo apt-get install -y --force-yes gcc"
73 sudo apt-get install -y --force-yes gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 73 sudo apt-get install -y --force-yes gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
74 - echo "install gcc success" 74 + echo "The gcc is installed."
75 fi 75 fi
76 76
77 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 77 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
78 - echo "install g++" 78 + echo "Installing g++."
79 require_sudoer "sudo apt-get install -y --force-yes g++" 79 require_sudoer "sudo apt-get install -y --force-yes g++"
80 sudo apt-get install -y --force-yes g++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 80 sudo apt-get install -y --force-yes g++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
81 - echo "install g++ success" 81 + echo "The g++ is installed."
82 fi 82 fi
83 83
84 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 84 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
85 - echo "install make" 85 + echo "Installing make."
86 require_sudoer "sudo apt-get install -y --force-yes make" 86 require_sudoer "sudo apt-get install -y --force-yes make"
87 sudo apt-get install -y --force-yes make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 87 sudo apt-get install -y --force-yes make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
88 - echo "install make success" 88 + echo "The make is installed."
89 fi 89 fi
90 90
91 patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 91 patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
92 - echo "install patch" 92 + echo "Installing patch."
93 require_sudoer "sudo apt-get install -y --force-yes patch" 93 require_sudoer "sudo apt-get install -y --force-yes patch"
94 sudo apt-get install -y --force-yes patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 94 sudo apt-get install -y --force-yes patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
95 - echo "install patch success" 95 + echo "The patch is installed."
96 fi 96 fi
97 97
98 unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 98 unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
99 - echo "install unzip" 99 + echo "Installing unzip."
100 require_sudoer "sudo apt-get install -y --force-yes unzip" 100 require_sudoer "sudo apt-get install -y --force-yes unzip"
101 sudo apt-get install -y --force-yes unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 101 sudo apt-get install -y --force-yes unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
102 - echo "install unzip success" 102 + echo "The unzip is installed."
103 fi 103 fi
104 104
105 if [ $SRS_NGINX = YES ]; then 105 if [ $SRS_NGINX = YES ]; then
106 if [[ ! -f /usr/include/pcre.h ]]; then 106 if [[ ! -f /usr/include/pcre.h ]]; then
107 - echo "install libpcre3-dev" 107 + echo "Installing libpcre3-dev."
108 require_sudoer "sudo apt-get install -y --force-yes libpcre3-dev" 108 require_sudoer "sudo apt-get install -y --force-yes libpcre3-dev"
109 sudo apt-get install -y --force-yes libpcre3-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 109 sudo apt-get install -y --force-yes libpcre3-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
110 - echo "install libpcre3-dev success" 110 + echo "The libpcre3-dev is installed."
111 fi 111 fi
112 fi 112 fi
113 113
114 if [ $SRS_FFMPEG_TOOL = YES ]; then 114 if [ $SRS_FFMPEG_TOOL = YES ]; then
115 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 115 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
116 - echo "install autoconf" 116 + echo "Installing autoconf."
117 require_sudoer "sudo apt-get install -y --force-yes autoconf" 117 require_sudoer "sudo apt-get install -y --force-yes autoconf"
118 sudo apt-get install -y --force-yes autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 118 sudo apt-get install -y --force-yes autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
119 - echo "install autoconf success" 119 + echo "The autoconf is installed."
120 fi 120 fi
121 121
122 libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 122 libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
123 - echo "install libtool" 123 + echo "Installing libtool."
124 require_sudoer "sudo apt-get install -y --force-yes libtool" 124 require_sudoer "sudo apt-get install -y --force-yes libtool"
125 sudo apt-get install -y --force-yes libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 125 sudo apt-get install -y --force-yes libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
126 - echo "install libtool success" 126 + echo "The libtool is installed."
127 fi 127 fi
128 128
129 if [[ ! -f /usr/include/zlib.h ]]; then 129 if [[ ! -f /usr/include/zlib.h ]]; then
130 - echo "install zlib1g-dev" 130 + echo "Installing zlib1g-dev."
131 require_sudoer "sudo apt-get install -y --force-yes zlib1g-dev" 131 require_sudoer "sudo apt-get install -y --force-yes zlib1g-dev"
132 sudo apt-get install -y --force-yes zlib1g-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 132 sudo apt-get install -y --force-yes zlib1g-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
133 - echo "install zlib1g-dev success" 133 + echo "The zlib1g-dev is installed."
134 fi 134 fi
135 fi 135 fi
136 136
137 - echo "Ubuntu install tools success" 137 + echo "Tools for Ubuntu are installed."
138 return 0 138 return 0
139 } 139 }
140 # donot prepare tools, for srs-librtmp depends only gcc and g++. 140 # donot prepare tools, for srs-librtmp depends only gcc and g++.
141 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 141 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
142 - Ubuntu_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Ubuntu prepare failed, ret=$ret"; exit $ret; fi 142 + Ubuntu_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Install tools for ubuntu failed, ret=$ret"; exit $ret; fi
143 fi 143 fi
144 ##################################################################################### 144 #####################################################################################
145 # for Centos, auto install tools by yum 145 # for Centos, auto install tools by yum
@@ -153,93 +153,93 @@ function Centos_prepare() @@ -153,93 +153,93 @@ function Centos_prepare()
153 153
154 # cross build for arm, install the cross build tool chain. 154 # cross build for arm, install the cross build tool chain.
155 if [ $SRS_CROSS_BUILD = YES ]; then 155 if [ $SRS_CROSS_BUILD = YES ]; then
156 - echo "embeded(arm/mips) is invalid for CentOS" 156 + echo "CentOS doesn't support crossbuild for arm/mips, please use Ubuntu instead."
157 return 1 157 return 1
158 fi 158 fi
159 159
160 OS_IS_CENTOS=YES 160 OS_IS_CENTOS=YES
161 - echo "Centos detected, install tools if needed" 161 + echo "Installing tools for Centos."
162 162
163 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 163 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
164 - echo "install gcc" 164 + echo "Installing gcc."
165 require_sudoer "sudo yum install -y gcc" 165 require_sudoer "sudo yum install -y gcc"
166 sudo yum install -y gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 166 sudo yum install -y gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
167 - echo "install gcc success" 167 + echo "The gcc is installed."
168 fi 168 fi
169 169
170 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 170 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
171 - echo "install gcc-c++" 171 + echo "Installing gcc-c++."
172 require_sudoer "sudo yum install -y gcc-c++" 172 require_sudoer "sudo yum install -y gcc-c++"
173 sudo yum install -y gcc-c++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 173 sudo yum install -y gcc-c++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
174 - echo "install gcc-c++ success" 174 + echo "The gcc-c++ is installed."
175 fi 175 fi
176 176
177 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 177 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
178 - echo "install make" 178 + echo "Installing make."
179 require_sudoer "sudo yum install -y make" 179 require_sudoer "sudo yum install -y make"
180 sudo yum install -y make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 180 sudo yum install -y make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
181 - echo "install make success" 181 + echo "The make is installed."
182 fi 182 fi
183 183
184 patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 184 patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
185 - echo "install patch" 185 + echo "Installing patch."
186 require_sudoer "sudo yum install -y patch" 186 require_sudoer "sudo yum install -y patch"
187 sudo yum install -y patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 187 sudo yum install -y patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
188 - echo "install patch success" 188 + echo "The patch is installed."
189 fi 189 fi
190 190
191 unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 191 unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
192 - echo "install unzip" 192 + echo "Installing unzip."
193 require_sudoer "sudo yum install -y unzip" 193 require_sudoer "sudo yum install -y unzip"
194 sudo yum install -y unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 194 sudo yum install -y unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
195 - echo "install unzip success" 195 + echo "The unzip is installed."
196 fi 196 fi
197 197
198 if [ $SRS_NGINX = YES ]; then 198 if [ $SRS_NGINX = YES ]; then
199 if [[ ! -f /usr/include/pcre.h ]]; then 199 if [[ ! -f /usr/include/pcre.h ]]; then
200 - echo "install pcre-devel" 200 + echo "Installing pcre-devel."
201 require_sudoer "sudo yum install -y pcre-devel" 201 require_sudoer "sudo yum install -y pcre-devel"
202 sudo yum install -y pcre-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 202 sudo yum install -y pcre-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
203 - echo "install pcre-devel success" 203 + echo "The pcre-devel is installed."
204 fi 204 fi
205 fi 205 fi
206 206
207 if [ $SRS_FFMPEG_TOOL = YES ]; then 207 if [ $SRS_FFMPEG_TOOL = YES ]; then
208 automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 208 automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
209 - echo "install automake" 209 + echo "Installing automake."
210 require_sudoer "sudo yum install -y automake" 210 require_sudoer "sudo yum install -y automake"
211 sudo yum install -y automake; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 211 sudo yum install -y automake; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
212 - echo "install automake success" 212 + echo "The automake is installed."
213 fi 213 fi
214 214
215 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 215 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
216 - echo "install autoconf" 216 + echo "Installing autoconf."
217 require_sudoer "sudo yum install -y autoconf" 217 require_sudoer "sudo yum install -y autoconf"
218 sudo yum install -y autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 218 sudo yum install -y autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
219 - echo "install autoconf success" 219 + echo "The autoconf is installed."
220 fi 220 fi
221 221
222 libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 222 libtool --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
223 - echo "install libtool" 223 + echo "Installing libtool."
224 require_sudoer "sudo yum install -y libtool" 224 require_sudoer "sudo yum install -y libtool"
225 sudo yum install -y libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 225 sudo yum install -y libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
226 - echo "install libtool success" 226 + echo "The libtool is installed."
227 fi 227 fi
228 228
229 if [[ ! -f /usr/include/zlib.h ]]; then 229 if [[ ! -f /usr/include/zlib.h ]]; then
230 - echo "install zlib-devel" 230 + echo "Installing zlib-devel."
231 require_sudoer "sudo yum install -y zlib-devel" 231 require_sudoer "sudo yum install -y zlib-devel"
232 sudo yum install -y zlib-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 232 sudo yum install -y zlib-devel; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
233 - echo "install zlib-devel success" 233 + echo "The zlib-devel is installed."
234 fi 234 fi
235 fi 235 fi
236 236
237 - echo "Centos install tools success" 237 + echo "Tools for Centos are installed."
238 return 0 238 return 0
239 } 239 }
240 # donot prepare tools, for srs-librtmp depends only gcc and g++. 240 # donot prepare tools, for srs-librtmp depends only gcc and g++.
241 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 241 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
242 - Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "CentOS prepare failed, ret=$ret"; exit $ret; fi 242 + Centos_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Install tools for CentOS failed, ret=$ret"; exit $ret; fi
243 fi 243 fi
244 ##################################################################################### 244 #####################################################################################
245 # for Centos, auto install tools by yum 245 # for Centos, auto install tools by yum
@@ -250,7 +250,7 @@ function OSX_prepare() @@ -250,7 +250,7 @@ function OSX_prepare()
250 uname -s|grep Darwin >/dev/null 2>&1 250 uname -s|grep Darwin >/dev/null 2>&1
251 ret=$?; if [[ 0 -ne $ret ]]; then 251 ret=$?; if [[ 0 -ne $ret ]]; then
252 if [ $SRS_OSX = YES ]; then 252 if [ $SRS_OSX = YES ]; then
253 - echo "OSX check failed, actual is `uname -s`" 253 + echo "Current OS `uname -s` is not OSX, please check your configure options."
254 exit 1; 254 exit 1;
255 fi 255 fi
256 return 0; 256 return 0;
@@ -258,110 +258,110 @@ function OSX_prepare() @@ -258,110 +258,110 @@ function OSX_prepare()
258 258
259 # cross build for arm, install the cross build tool chain. 259 # cross build for arm, install the cross build tool chain.
260 if [ $SRS_CROSS_BUILD = YES ]; then 260 if [ $SRS_CROSS_BUILD = YES ]; then
261 - echo "embeded(arm/mips) is invalid for OSX" 261 + echo "OSX doesn't support crossbuild for arm/mips, please use Ubuntu instead."
262 return 1 262 return 1
263 fi 263 fi
264 264
265 OS_IS_OSX=YES 265 OS_IS_OSX=YES
266 - echo "OSX detected, install tools if needed" 266 + echo "Installing tools for OSX."
267 # requires the osx when os 267 # requires the osx when os
268 if [ $OS_IS_OSX = YES ]; then 268 if [ $OS_IS_OSX = YES ]; then
269 if [ $SRS_OSX = NO ]; then 269 if [ $SRS_OSX = NO ]; then
270 - echo "OSX detected, must specifies the --osx" 270 + echo "Invalid configure options for OSX, please specify --osx."
271 exit 1 271 exit 1
272 fi 272 fi
273 fi 273 fi
274 274
275 brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 275 brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
276 - echo "install brew" 276 + echo "Installing brew."
277 echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\"" 277 echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""
278 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 278 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
279 - echo "install brew success" 279 + echo "The brew is installed."
280 fi 280 fi
281 281
282 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 282 gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
283 - echo "install gcc" 283 + echo "Installing gcc."
284 echo "brew install gcc" 284 echo "brew install gcc"
285 brew install gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 285 brew install gcc; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
286 - echo "install gcc success" 286 + echo "The gcc is installed."
287 fi 287 fi
288 288
289 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 289 g++ --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
290 - echo "install gcc-c++" 290 + echo "Installing gcc-c++."
291 echo "brew install gcc-c++" 291 echo "brew install gcc-c++"
292 brew install gcc-c++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 292 brew install gcc-c++; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
293 - echo "install gcc-c++ success" 293 + echo "The gcc-c++ is installed."
294 fi 294 fi
295 295
296 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 296 make --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
297 - echo "install make" 297 + echo "Installing make."
298 echo "brew install make" 298 echo "brew install make"
299 brew install make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 299 brew install make; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
300 - echo "install make success" 300 + echo "The make is installed."
301 fi 301 fi
302 302
303 patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 303 patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
304 - echo "install patch" 304 + echo "Installing patch."
305 echo "brew install patch" 305 echo "brew install patch"
306 brew install patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 306 brew install patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
307 - echo "install patch success" 307 + echo "The patch is installed."
308 fi 308 fi
309 309
310 unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 310 unzip --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
311 - echo "install unzip" 311 + echo "Installing unzip."
312 echo "brew install unzip" 312 echo "brew install unzip"
313 brew install unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 313 brew install unzip; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
314 - echo "install unzip success" 314 + echo "The unzip is installed."
315 fi 315 fi
316 316
317 if [ $SRS_NGINX = YES ]; then 317 if [ $SRS_NGINX = YES ]; then
318 if [[ ! -f /usr/local/include/pcre.h ]]; then 318 if [[ ! -f /usr/local/include/pcre.h ]]; then
319 - echo "install pcre" 319 + echo "Installing pcre."
320 echo "brew install pcre" 320 echo "brew install pcre"
321 brew install pcre; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 321 brew install pcre; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
322 - echo "install pcre success" 322 + echo "The pcre is installed."
323 fi 323 fi
324 fi 324 fi
325 325
326 if [ $SRS_FFMPEG_TOOL = YES ]; then 326 if [ $SRS_FFMPEG_TOOL = YES ]; then
327 automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 327 automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
328 - echo "install automake" 328 + echo "Installing automake."
329 echo "brew install automake" 329 echo "brew install automake"
330 brew install automake; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 330 brew install automake; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
331 - echo "install automake success" 331 + echo "The automake is installed."
332 fi 332 fi
333 333
334 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 334 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
335 - echo "install autoconf" 335 + echo "Installing autoconf."
336 echo "brew install autoconf" 336 echo "brew install autoconf"
337 brew install autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 337 brew install autoconf; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
338 - echo "install autoconf success" 338 + echo "The autoconf is installed."
339 fi 339 fi
340 340
341 which libtool >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 341 which libtool >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
342 - echo "install libtool" 342 + echo "Installing libtool."
343 echo "brew install libtool" 343 echo "brew install libtool"
344 brew install libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 344 brew install libtool; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
345 - echo "install libtool success" 345 + echo "The libtool is installed."
346 fi 346 fi
347 347
348 brew info zlib >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 348 brew info zlib >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
349 - echo "install zlib" 349 + echo "Installing zlib."
350 echo "brew install zlib" 350 echo "brew install zlib"
351 brew install zlib; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi 351 brew install zlib; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
352 - echo "install zlib success" 352 + echo "The zlib is installed."
353 fi 353 fi
354 fi 354 fi
355 355
356 - echo "OSX install tools success" 356 + echo "Tools for OSX are installed."
357 return 0 357 return 0
358 } 358 }
359 # donot prepare tools, for srs-librtmp depends only gcc and g++. 359 # donot prepare tools, for srs-librtmp depends only gcc and g++.
360 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 360 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
361 - OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "OSX prepare failed, ret=$ret"; exit $ret; fi 361 + OSX_prepare; ret=$?; if [[ 0 -ne $ret ]]; then echo "Install tools for OSX failed, ret=$ret"; exit $ret; fi
362 fi 362 fi
363 363
364 -# the sed command 364 +# We must use a bash function instead of variable.
365 function sed_utility() { 365 function sed_utility() {
366 if [ $OS_IS_OSX = YES ]; then 366 if [ $OS_IS_OSX = YES ]; then
367 sed -i '' "$@" 367 sed -i '' "$@"
@@ -391,7 +391,7 @@ SED="sed_utility" && echo "SED is $SED" @@ -391,7 +391,7 @@ SED="sed_utility" && echo "SED is $SED"
391 # others is invalid. 391 # others is invalid.
392 if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $OS_IS_OSX = NO && $SRS_EXPORT_LIBRTMP_PROJECT = NO ]]; then 392 if [[ $OS_IS_UBUNTU = NO && $OS_IS_CENTOS = NO && $OS_IS_OSX = NO && $SRS_EXPORT_LIBRTMP_PROJECT = NO ]]; then
393 if [[ $SRS_PI = NO && $SRS_CUBIE = NO && $SRS_CROSS_BUILD = NO ]]; then 393 if [[ $SRS_PI = NO && $SRS_CUBIE = NO && $SRS_CROSS_BUILD = NO ]]; then
394 - echo "what a fuck, os not supported." 394 + echo "What a fuck, your OS `uname -s` is not supported."
395 exit 1 395 exit 1
396 fi 396 fi
397 fi 397 fi
@@ -411,11 +411,11 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -411,11 +411,11 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
411 if [ $SRS_CROSS_BUILD = YES ]; then 411 if [ $SRS_CROSS_BUILD = YES ]; then
412 # ok, arm specified, if the flag filed does not exists, need to rebuild. 412 # ok, arm specified, if the flag filed does not exists, need to rebuild.
413 if [[ -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then 413 if [[ -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
414 - echo "st-1.9t for arm is ok."; 414 + echo "The st-1.9t for arm is ok.";
415 else 415 else
416 # TODO: FIXME: patch the bug. 416 # TODO: FIXME: patch the bug.
417 # patch st for arm, @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix 417 # patch st for arm, @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix
418 - echo "build st-1.9t for arm"; 418 + echo "Building st-1.9t for arm.";
419 ( 419 (
420 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 420 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
421 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && chmod +w * && 421 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && chmod +w * &&
@@ -429,10 +429,10 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -429,10 +429,10 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
429 fi 429 fi
430 else 430 else
431 if [[ ! -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then 431 if [[ ! -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
432 - echo "st-1.9t is ok."; 432 + echo "The st-1.9t is ok.";
433 else 433 else
434 # patch st for arm, @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix 434 # patch st for arm, @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix
435 - echo "build st-1.9t"; 435 + echo "Building st-1.9t.";
436 ( 436 (
437 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && 437 rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
438 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && chmod +w * && 438 unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && chmod +w * &&
@@ -446,8 +446,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -446,8 +446,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
446 fi 446 fi
447 fi 447 fi
448 # check status 448 # check status
449 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build st-1.9 failed, ret=$ret"; exit $ret; fi  
450 - if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "build st-1.9 static lib failed."; exit -1; fi 449 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build st-1.9 failed, ret=$ret"; exit $ret; fi
  450 + if [ ! -f ${SRS_OBJS}/st/libst.a ]; then echo "Build st-1.9 static lib failed."; exit -1; fi
451 fi 451 fi
452 452
453 ##################################################################################### 453 #####################################################################################
@@ -455,7 +455,7 @@ fi @@ -455,7 +455,7 @@ fi
455 ##################################################################################### 455 #####################################################################################
456 # check the cross build flag file, if flag changed, need to rebuild the st. 456 # check the cross build flag file, if flag changed, need to rebuild the st.
457 if [ $SRS_HTTP_CORE = YES ]; then 457 if [ $SRS_HTTP_CORE = YES ]; then
458 - echo "http-parser is copied into srs_http_stack.*pp" 458 + echo "The http-parser is copied into srs_http_stack.*pp"
459 fi 459 fi
460 460
461 ##################################################################################### 461 #####################################################################################
@@ -464,10 +464,8 @@ fi @@ -464,10 +464,8 @@ fi
464 function write_nginx_html5() 464 function write_nginx_html5()
465 { 465 {
466 cat<<END > ${html_file} 466 cat<<END > ${html_file}
467 -<video width="640" height="360"  
468 - autoplay controls autobuffer  
469 - src="${hls_stream}"  
470 - type="application/vnd.apple.mpegurl"> 467 +<video "autoplay" "controls" "autobuffer" type="application/vnd.apple.mpegurl"
  468 + src="${hls_stream}">
471 </video> 469 </video>
472 END 470 END
473 } 471 }
@@ -479,9 +477,9 @@ fi @@ -479,9 +477,9 @@ fi
479 __SRS_BUILD_NGINX=NO; if [ $SRS_CROSS_BUILD = NO ]; then if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi fi 477 __SRS_BUILD_NGINX=NO; if [ $SRS_CROSS_BUILD = NO ]; then if [ $SRS_NGINX = YES ]; then __SRS_BUILD_NGINX=YES; fi fi
480 if [ $__SRS_BUILD_NGINX = YES ]; then 478 if [ $__SRS_BUILD_NGINX = YES ]; then
481 if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then 479 if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then
482 - echo "nginx-1.5.7 is ok."; 480 + echo "The nginx-1.5.7 is ok.";
483 else 481 else
484 - echo "build nginx-1.5.7"; 482 + echo "Building nginx-1.5.7";
485 ( 483 (
486 rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} && 484 rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} &&
487 unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 && 485 unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 &&
@@ -490,8 +488,8 @@ if [ $__SRS_BUILD_NGINX = YES ]; then @@ -490,8 +488,8 @@ if [ $__SRS_BUILD_NGINX = YES ]; then
490 ) 488 )
491 fi 489 fi
492 # check status 490 # check status
493 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build nginx-1.5.7 failed, ret=$ret"; exit $ret; fi  
494 - if [ ! -f ${SRS_OBJS}/nginx/sbin/nginx ]; then echo "build nginx-1.5.7 failed."; exit -1; fi 491 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build nginx-1.5.7 failed, ret=$ret"; exit $ret; fi
  492 + if [ ! -f ${SRS_OBJS}/nginx/sbin/nginx ]; then echo "Build nginx-1.5.7 failed."; exit -1; fi
495 493
496 # use current user to config nginx, 494 # use current user to config nginx,
497 # srs will write ts/m3u8 file use current user, 495 # srs will write ts/m3u8 file use current user,
@@ -526,7 +524,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -526,7 +524,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
526 ln -sf `pwd`/research/api-server/static-dir/favicon.ico ${SRS_OBJS}/nginx/html/favicon.ico 524 ln -sf `pwd`/research/api-server/static-dir/favicon.ico ${SRS_OBJS}/nginx/html/favicon.ico
527 525
528 # nginx.html to detect whether nginx is alive 526 # nginx.html to detect whether nginx is alive
529 - echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html 527 + echo "Nginx is ok." > ${SRS_OBJS}/nginx/html/nginx.html
530 fi 528 fi
531 529
532 ##################################################################################### 530 #####################################################################################
@@ -537,7 +535,7 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then @@ -537,7 +535,7 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then
537 echo "CherryPy-3.2.4 is ok."; 535 echo "CherryPy-3.2.4 is ok.";
538 else 536 else
539 require_sudoer "install CherryPy-3.2.4" 537 require_sudoer "install CherryPy-3.2.4"
540 - echo "install CherryPy-3.2.4"; 538 + echo "Installing CherryPy-3.2.4";
541 ( 539 (
542 sudo rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} && 540 sudo rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} &&
543 unzip -q ../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 && 541 unzip -q ../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 &&
@@ -550,7 +548,7 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then @@ -550,7 +548,7 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then
550 fi 548 fi
551 549
552 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 550 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
553 - echo "link players to cherrypy static-dir" 551 + echo "Link players to cherrypy static-dir"
554 rm -rf research/api-server/static-dir/players && 552 rm -rf research/api-server/static-dir/players &&
555 ln -sf `pwd`/research/players research/api-server/static-dir/players && 553 ln -sf `pwd`/research/players research/api-server/static-dir/players &&
556 rm -f research/api-server/static-dir/crossdomain.xml && 554 rm -f research/api-server/static-dir/crossdomain.xml &&
@@ -561,7 +559,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -561,7 +559,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
561 rm -rf research/api-server/static-dir/forward && 559 rm -rf research/api-server/static-dir/forward &&
562 mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward && 560 mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward &&
563 ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward 561 ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward
564 - ret=$?; if [[ $ret -ne 0 ]]; then echo "[warn] link players to cherrypy static-dir failed"; fi 562 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Warning: Ignore error to link players to cherrypy static-dir."; fi
565 fi 563 fi
566 564
567 ##################################################################################### 565 #####################################################################################
@@ -600,15 +598,15 @@ OPENSSL_HOTFIX="-DOPENSSL_NO_HEARTBEATS" @@ -600,15 +598,15 @@ OPENSSL_HOTFIX="-DOPENSSL_NO_HEARTBEATS"
600 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS. 598 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.
601 if [ $SRS_SSL = YES ]; then 599 if [ $SRS_SSL = YES ]; then
602 if [ $SRS_USE_SYS_SSL = YES ]; then 600 if [ $SRS_USE_SYS_SSL = YES ]; then
603 - echo "warning: donot compile ssl, use system ssl" 601 + echo "Warning: Use system libssl, without compiling openssl."
604 else 602 else
605 # check the cross build flag file, if flag changed, need to rebuild the st. 603 # check the cross build flag file, if flag changed, need to rebuild the st.
606 if [ $SRS_CROSS_BUILD = YES ]; then 604 if [ $SRS_CROSS_BUILD = YES ]; then
607 # ok, arm specified, if the flag filed does not exists, need to rebuild. 605 # ok, arm specified, if the flag filed does not exists, need to rebuild.
608 if [[ -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then 606 if [[ -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then
609 - echo "openssl-1.0.1f for arm is ok."; 607 + echo "The openssl-1.0.1f for arm is ok.";
610 else 608 else
611 - echo "build openssl-1.0.1f for arm"; 609 + echo "Building openssl-1.0.1f for ARM.";
612 ( 610 (
613 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 611 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
614 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 612 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
@@ -623,9 +621,9 @@ if [ $SRS_SSL = YES ]; then @@ -623,9 +621,9 @@ if [ $SRS_SSL = YES ]; then
623 else 621 else
624 # cross build not specified, if exists flag, need to rebuild for no-arm platform. 622 # cross build not specified, if exists flag, need to rebuild for no-arm platform.
625 if [[ ! -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then 623 if [[ ! -f ${SRS_OBJS}/_flag.ssl.cross.build.tmp && -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then
626 - echo "openssl-1.0.1f is ok."; 624 + echo "Openssl-1.0.1f is ok.";
627 else 625 else
628 - echo "build openssl-1.0.1f"; 626 + echo "Building openssl-1.0.1f.";
629 ( 627 (
630 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 628 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
631 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 629 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
@@ -637,8 +635,8 @@ if [ $SRS_SSL = YES ]; then @@ -637,8 +635,8 @@ if [ $SRS_SSL = YES ]; then
637 fi 635 fi
638 fi 636 fi
639 # check status 637 # check status
640 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build openssl-1.0.1f failed, ret=$ret"; exit $ret; fi  
641 - if [ ! -f ${SRS_OBJS}/openssl/lib/libssl.a ]; then echo "build openssl-1.0.1f failed."; exit -1; fi 638 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build openssl-1.0.1f failed, ret=$ret"; exit $ret; fi
  639 + if [ ! -f ${SRS_OBJS}/openssl/lib/libssl.a ]; then echo "Build openssl-1.0.1f failed."; exit -1; fi
642 fi 640 fi
643 fi 641 fi
644 642
@@ -647,9 +645,9 @@ fi @@ -647,9 +645,9 @@ fi
647 ##################################################################################### 645 #####################################################################################
648 if [ $SRS_FFMPEG_TOOL = YES ]; then 646 if [ $SRS_FFMPEG_TOOL = YES ]; then
649 if [[ -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then 647 if [[ -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then
650 - echo "ffmpeg-2.1 is ok."; 648 + echo "The ffmpeg-2.1 is ok.";
651 else 649 else
652 - echo "build ffmpeg-2.1"; 650 + echo "Building ffmpeg-2.1.";
653 ( 651 (
654 cd ${SRS_OBJS} && pwd_dir=`pwd` && 652 cd ${SRS_OBJS} && pwd_dir=`pwd` &&
655 rm -rf ffmepg.src && mkdir -p ffmpeg.src && cd ffmpeg.src && 653 rm -rf ffmepg.src && mkdir -p ffmpeg.src && cd ffmpeg.src &&
@@ -658,8 +656,8 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then @@ -658,8 +656,8 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then
658 ) 656 )
659 fi 657 fi
660 # check status 658 # check status
661 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build ffmpeg-2.1 failed, ret=$ret"; exit $ret; fi  
662 - if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-2.1 failed."; exit -1; fi 659 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build ffmpeg-2.1 failed, ret=$ret"; exit $ret; fi
  660 + if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "Build ffmpeg-2.1 failed."; exit -1; fi
663 fi 661 fi
664 662
665 ##################################################################################### 663 #####################################################################################
@@ -670,10 +668,10 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -670,10 +668,10 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
670 mkdir -p ${SRS_OBJS}/research 668 mkdir -p ${SRS_OBJS}/research
671 669
672 (cd ${SRS_WORKDIR}/research/hls && make ${SRS_JOBS} && mv ts_info ../../${SRS_OBJS_DIR}/research) 670 (cd ${SRS_WORKDIR}/research/hls && make ${SRS_JOBS} && mv ts_info ../../${SRS_OBJS_DIR}/research)
673 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi 671 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build research/hls failed, ret=$ret"; exit $ret; fi
674 672
675 (cd research/ffempty && make ${SRS_JOBS} && mv ffempty ../../${SRS_OBJS_DIR}/research) 673 (cd research/ffempty && make ${SRS_JOBS} && mv ffempty ../../${SRS_OBJS_DIR}/research)
676 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi 674 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build research/ffempty failed, ret=$ret"; exit $ret; fi
677 fi 675 fi
678 fi 676 fi
679 677
@@ -682,7 +680,7 @@ if [ $SRS_LIBRTMP = YES ]; then @@ -682,7 +680,7 @@ if [ $SRS_LIBRTMP = YES ]; then
682 680
683 # librtmp 681 # librtmp
684 (cd ${SRS_WORKDIR}/research/librtmp && mkdir -p objs && ln -sf `pwd`/objs ../../${SRS_OBJS_DIR}/research/librtmp) 682 (cd ${SRS_WORKDIR}/research/librtmp && mkdir -p objs && ln -sf `pwd`/objs ../../${SRS_OBJS_DIR}/research/librtmp)
685 - ret=$?; if [[ $ret -ne 0 ]]; then echo "link research/librtmp failed, ret=$ret"; exit $ret; fi 683 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Link research/librtmp failed, ret=$ret"; exit $ret; fi
686 fi 684 fi
687 685
688 ##################################################################################### 686 #####################################################################################
@@ -690,9 +688,9 @@ fi @@ -690,9 +688,9 @@ fi
690 ##################################################################################### 688 #####################################################################################
691 if [ $SRS_UTEST = YES ]; then 689 if [ $SRS_UTEST = YES ]; then
692 if [[ -f ${SRS_OBJS}/gtest/include/gtest/gtest.h ]]; then 690 if [[ -f ${SRS_OBJS}/gtest/include/gtest/gtest.h ]]; then
693 - echo "gtest-1.6.0 is ok."; 691 + echo "The gtest-1.6.0 is ok.";
694 else 692 else
695 - echo "build gtest-1.6.0"; 693 + echo "Build gtest-1.6.0";
696 ( 694 (
697 rm -rf ${SRS_OBJS}/gtest-1.6.0 && cd ${SRS_OBJS} && 695 rm -rf ${SRS_OBJS}/gtest-1.6.0 && cd ${SRS_OBJS} &&
698 unzip -q ../3rdparty/gtest-1.6.0.zip && 696 unzip -q ../3rdparty/gtest-1.6.0.zip &&
@@ -700,8 +698,8 @@ if [ $SRS_UTEST = YES ]; then @@ -700,8 +698,8 @@ if [ $SRS_UTEST = YES ]; then
700 ) 698 )
701 fi 699 fi
702 # check status 700 # check status
703 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build gtest-1.6.0 failed, ret=$ret"; exit $ret; fi  
704 - if [ ! -f ${SRS_OBJS}/gtest/include/gtest/gtest.h ]; then echo "build gtest-1.6.0 failed."; exit -1; fi 701 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build gtest-1.6.0 failed, ret=$ret"; exit $ret; fi
  702 + if [ ! -f ${SRS_OBJS}/gtest/include/gtest/gtest.h ]; then echo "Build gtest-1.6.0 failed."; exit -1; fi
705 fi 703 fi
706 704
707 ##################################################################################### 705 #####################################################################################
@@ -709,9 +707,9 @@ fi @@ -709,9 +707,9 @@ fi
709 ##################################################################################### 707 #####################################################################################
710 if [ $SRS_GPERF = YES ]; then 708 if [ $SRS_GPERF = YES ]; then
711 if [[ -f ${SRS_OBJS}/gperf/bin/pprof ]]; then 709 if [[ -f ${SRS_OBJS}/gperf/bin/pprof ]]; then
712 - echo "gperftools-2.1 is ok."; 710 + echo "The gperftools-2.1 is ok.";
713 else 711 else
714 - echo "build gperftools-2.1"; 712 + echo "Build gperftools-2.1";
715 ( 713 (
716 rm -rf ${SRS_OBJS}/gperftools-2.1 && cd ${SRS_OBJS} && 714 rm -rf ${SRS_OBJS}/gperftools-2.1 && cd ${SRS_OBJS} &&
717 unzip -q ../3rdparty/gperftools-2.1.zip && cd gperftools-2.1 && 715 unzip -q ../3rdparty/gperftools-2.1.zip && cd gperftools-2.1 &&
@@ -721,8 +719,8 @@ if [ $SRS_GPERF = YES ]; then @@ -721,8 +719,8 @@ if [ $SRS_GPERF = YES ]; then
721 ) 719 )
722 fi 720 fi
723 # check status 721 # check status
724 - ret=$?; if [[ $ret -ne 0 ]]; then echo "build gperftools-2.1 failed, ret=$ret"; exit $ret; fi  
725 - if [ ! -f ${SRS_OBJS}/gperf/bin/pprof ]; then echo "build gperftools-2.1 failed."; exit -1; fi 722 + ret=$?; if [[ $ret -ne 0 ]]; then echo "Build gperftools-2.1 failed, ret=$ret"; exit $ret; fi
  723 + if [ ! -f ${SRS_OBJS}/gperf/bin/pprof ]; then echo "Build gperftools-2.1 failed."; exit -1; fi
726 fi 724 fi
727 725
728 ##################################################################################### 726 #####################################################################################
@@ -14,7 +14,7 @@ FILE=${SRS_OBJS}/${SRS_MAKEFILE} @@ -14,7 +14,7 @@ FILE=${SRS_OBJS}/${SRS_MAKEFILE}
14 LIB_TARGET="${SRS_OBJS_DIR}/${LIB_NAME}" 14 LIB_TARGET="${SRS_OBJS_DIR}/${LIB_NAME}"
15 LIB_TAGET_STATIC="${LIB_TARGET}.a" 15 LIB_TAGET_STATIC="${LIB_TARGET}.a"
16 16
17 -echo "generate lib ${LIB_NAME} depends..." 17 +echo "Generating lib ${LIB_NAME} depends."
18 18
19 echo "" >> ${FILE} 19 echo "" >> ${FILE}
20 echo "# archive library ${LIB_TAGET_STATIC}" >> ${FILE} 20 echo "# archive library ${LIB_TAGET_STATIC}" >> ${FILE}
@@ -60,4 +60,4 @@ echo "" >> ${FILE} @@ -60,4 +60,4 @@ echo "" >> ${FILE}
60 echo " @mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 60 echo " @mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
61 echo " @mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 61 echo " @mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
62 62
63 -echo -n "generate lib ${LIB_NAME} ok"; echo '!'; 63 +echo -n "Generate lib ${LIB_NAME} ok"; echo '!';
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 17
18 FILE=${SRS_OBJS}/${SRS_MAKEFILE} 18 FILE=${SRS_OBJS}/${SRS_MAKEFILE}
19 echo "#####################################################################################" >> ${FILE} 19 echo "#####################################################################################" >> ${FILE}
20 -echo "# the ${MODULE_ID} module." >> ${FILE} 20 +echo "# The module ${MODULE_ID}." >> ${FILE}
21 echo "#####################################################################################" >> ${FILE} 21 echo "#####################################################################################" >> ${FILE}
22 echo >> ${FILE} 22 echo >> ${FILE}
23 23
@@ -88,4 +88,4 @@ echo "" >> ${FILE} @@ -88,4 +88,4 @@ echo "" >> ${FILE}
88 # parent Makefile, to create module output dir before compile it. 88 # parent Makefile, to create module output dir before compile it.
89 echo " @mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 89 echo " @mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
90 90
91 -echo -n "generate module ${MODULE_ID} ok"; echo '!'; 91 +echo -n "Generate modules ${MODULE_ID} ok"; echo '!';
@@ -892,7 +892,8 @@ SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}" @@ -892,7 +892,8 @@ SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}"
892 if [ $SRS_LOG_VERBOSE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-verbose"; fi 892 if [ $SRS_LOG_VERBOSE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-verbose"; fi
893 if [ $SRS_LOG_INFO = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-info"; fi 893 if [ $SRS_LOG_INFO = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-info"; fi
894 if [ $SRS_LOG_TRACE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-trace"; fi 894 if [ $SRS_LOG_TRACE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-trace"; fi
895 - echo "regenerate config: ${SRS_AUTO_CONFIGURE}" 895 + echo "User config: $SRS_AUTO_USER_CONFIGURE"
  896 + echo "Detail config: ${SRS_AUTO_CONFIGURE}"
896 } 897 }
897 regenerate_options 898 regenerate_options
898 899
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # colorful summary 3 # colorful summary
4 -SrsHlsSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HLS = YES ]; then SrsHlsSummaryColor="\${GREEN}"; fi  
5 -SrsDvrSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_DVR = YES ]; then SrsDvrSummaryColor="\${GREEN}"; fi  
6 -SrsNginxSummaryColor="\${GREEN}{disabled} "; if [ $SRS_NGINX = YES ]; then SrsNginxSummaryColor="\${GREEN}"; fi  
7 -SrsSslSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_SSL = YES ]; then SrsSslSummaryColor="\${GREEN}"; fi  
8 -SrsFfmpegSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_FFMPEG_TOOL = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi  
9 -SrsTranscodeSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_TRANSCODE = YES ]; then SrsTranscodeSummaryColor="\${GREEN}"; fi  
10 -SrsIngestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_INGEST = YES ]; then SrsIngestSummaryColor="\${GREEN}"; fi  
11 -SrsHttpCallbackSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi  
12 -SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi  
13 -SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi  
14 -SrsStreamCasterSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_STREAM_CASTER = YES ]; then SrsStreamCasterSummaryColor="\${GREEN}"; fi  
15 -SrsKafkaSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_KAFKA = YES ]; then SrsKafkaSummaryColor="\${GREEN}"; fi  
16 -SrsLibrtmpSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then SrsLibrtmpSummaryColor="\${GREEN}"; fi  
17 -SrsLibrtmpSSLSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then if [ $SRS_SSL = YES ]; then SrsLibrtmpSSLSummaryColor="\${GREEN}"; fi fi  
18 -SrsResearchSummaryColor="\${GREEN}{disabled} "; if [ $SRS_RESEARCH = YES ]; then SrsResearchSummaryColor="\${GREEN}"; fi  
19 -SrsUtestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_UTEST = YES ]; then SrsUtestSummaryColor="\${GREEN}"; fi  
20 -SrsGperfSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF = YES ]; then SrsGperfSummaryColor="\${GREEN}"; fi  
21 -SrsGperfMCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MC = YES ]; then SrsGperfMCSummaryColor="\${YELLOW}"; fi  
22 -SrsGperfMDSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MD = YES ]; then SrsGperfMDSummaryColor="\${YELLOW}"; fi  
23 -SrsGperfMPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MP = YES ]; then SrsGperfMPSummaryColor="\${YELLOW}"; fi  
24 -SrsGperfCPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_CP = YES ]; then SrsGperfCPSummaryColor="\${YELLOW}"; fi  
25 -SrsGprofSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPROF = YES ]; then SrsGprofSummaryColor="\${YELLOW}"; fi 4 +SrsHlsSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HLS = YES ]; then SrsHlsSummaryColor="\${GREEN}"; fi
  5 +SrsDvrSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_DVR = YES ]; then SrsDvrSummaryColor="\${GREEN}"; fi
  6 +SrsNginxSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_NGINX = YES ]; then SrsNginxSummaryColor="\${GREEN}"; fi
  7 +SrsSslSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_SSL = YES ]; then SrsSslSummaryColor="\${GREEN}"; fi
  8 +SrsFfmpegSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_FFMPEG_TOOL = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi
  9 +SrsTranscodeSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_TRANSCODE = YES ]; then SrsTranscodeSummaryColor="\${GREEN}"; fi
  10 +SrsIngestSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_INGEST = YES ]; then SrsIngestSummaryColor="\${GREEN}"; fi
  11 +SrsHttpCallbackSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi
  12 +SrsHttpServerSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi
  13 +SrsHttpApiSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi
  14 +SrsStreamCasterSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_STREAM_CASTER = YES ]; then SrsStreamCasterSummaryColor="\${GREEN}"; fi
  15 +SrsKafkaSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_KAFKA = YES ]; then SrsKafkaSummaryColor="\${GREEN}"; fi
  16 +SrsLibrtmpSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_LIBRTMP = YES ]; then SrsLibrtmpSummaryColor="\${GREEN}"; fi
  17 +SrsLibrtmpSSLSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_LIBRTMP = YES ]; then if [ $SRS_SSL = YES ]; then SrsLibrtmpSSLSummaryColor="\${GREEN}"; fi fi
  18 +SrsResearchSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_RESEARCH = YES ]; then SrsResearchSummaryColor="\${GREEN}"; fi
  19 +SrsUtestSummaryColor="\${YELLOW}(Disabled) "; if [ $SRS_UTEST = YES ]; then SrsUtestSummaryColor="\${GREEN}"; fi
  20 +SrsGperfSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF = YES ]; then SrsGperfSummaryColor="\${GREEN}"; fi
  21 +SrsGperfMCSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF_MC = YES ]; then SrsGperfMCSummaryColor="\${YELLOW}"; fi
  22 +SrsGperfMDSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF_MD = YES ]; then SrsGperfMDSummaryColor="\${YELLOW}"; fi
  23 +SrsGperfMPSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF_MP = YES ]; then SrsGperfMPSummaryColor="\${YELLOW}"; fi
  24 +SrsGperfCPSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPERF_CP = YES ]; then SrsGperfCPSummaryColor="\${YELLOW}"; fi
  25 +SrsGprofSummaryColor="\${GREEN}(Disabled) "; if [ $SRS_GPROF = YES ]; then SrsGprofSummaryColor="\${YELLOW}"; fi
26 26
27 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 27 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
28 cat <<END > ${SRS_OBJS}/${SRS_BUILD_SUMMARY} 28 cat <<END > ${SRS_OBJS}/${SRS_BUILD_SUMMARY}
@@ -35,81 +35,26 @@ GREEN="\\${GREEN}" @@ -35,81 +35,26 @@ GREEN="\\${GREEN}"
35 YELLOW="\\${YELLOW}" 35 YELLOW="\\${YELLOW}"
36 BLACK="\\${BLACK}" 36 BLACK="\\${BLACK}"
37 37
38 -echo -e "\${GREEN}build summary:\${BLACK}" 38 +echo -e "\${GREEN}The build summary:\${BLACK}"
39 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" 39 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
40 -echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/ossrs/srs/wiki/v1_CN_GPERF\${BLACK}"  
41 -echo -e " | ${SrsGperfMDSummaryColor}gmd @see: http://blog.csdn.net/win_lin/article/details/50461709\${BLACK}"  
42 -echo -e " | ${SrsGperfMDSummaryColor}gmd: gperf memory defense, or memory corrupt detect\${BLACK}"  
43 -echo -e " | ${SrsGperfMDSummaryColor}env TCMALLOC_PAGE_FENCE=1 ./objs/srs -c conf/console.conf\${BLACK}"  
44 -echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}"  
45 -echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check, or memory leak detect\${BLACK}"  
46 -echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf 2>gmc.log # start gmc\${BLACK}"  
47 -echo -e " | ${SrsGperfMCSummaryColor}killall -2 srs # or CTRL+C to stop gmc\${BLACK}"  
48 -echo -e " | ${SrsGperfMCSummaryColor}cat gmc.log # to analysis memory leak\${BLACK}"  
49 -echo -e " | ${SrsGperfMPSummaryColor}gmp @see: http://google-perftools.googlecode.com/svn/trunk/doc/heapprofile.html\${BLACK}"  
50 -echo -e " | ${SrsGperfMPSummaryColor}gmp: gperf memory profile, similar to gcp\${BLACK}"  
51 -echo -e " | ${SrsGperfMPSummaryColor}rm -f gperf.srs.gmp*; ./objs/srs -c conf/console.conf # start gmp\${BLACK}"  
52 -echo -e " | ${SrsGperfMPSummaryColor}killall -2 srs # or CTRL+C to stop gmp\${BLACK}"  
53 -echo -e " | ${SrsGperfMPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gmp* # to analysis memory profile\${BLACK}"  
54 -echo -e " | ${SrsGperfCPSummaryColor}gcp @see: http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html\${BLACK}"  
55 -echo -e " | ${SrsGperfCPSummaryColor}gcp: gperf cpu profile\${BLACK}"  
56 -echo -e " | ${SrsGperfCPSummaryColor}rm -f gperf.srs.gcp*; ./objs/srs -c conf/console.conf # start gcp\${BLACK}"  
57 -echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}"  
58 -echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" 40 +echo -e " \${GREEN}For SRS benchmark, recomment the following tools:\${BLACK}"
  41 +echo -e " \${GREEN} About gperf, gprof and valgrind, please read http://blog.csdn.net/win_lin/article/details/53503869\${BLACK}"
59 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" 42 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
60 -echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/ossrs/srs/wiki/v1_CN_GPROF\${BLACK}"  
61 -echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}"  
62 -echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}"  
63 -echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}"  
64 -echo -e " | ${SrsGprofSummaryColor}gprof -b ./objs/srs gmon.out > gprof.srs.log && rm -f gmon.out # gprof report to gprof.srs.log\${BLACK}" 43 +echo -e " |\${GREEN}The main server usage: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}"
  44 +echo -e " | ${SrsHlsSummaryColor}About HLS, please read https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS\${BLACK}"
  45 +echo -e " | ${SrsDvrSummaryColor}About DVR, please read https://github.com/ossrs/srs/wiki/v2_CN_DVR\${BLACK}"
  46 +echo -e " | ${SrsNginxSummaryColor}About NGINX, please read https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS\${BLACK}"
  47 +echo -e " | ${SrsSslSummaryColor}About SSL, please read https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake\${BLACK}"
  48 +echo -e " | ${SrsFfmpegSummaryColor}About FFMPEG, please read https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG\${BLACK}"
  49 +echo -e " | ${SrsTranscodeSummaryColor}About transcoding, please read https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG\${BLACK}"
  50 +echo -e " | ${SrsIngestSummaryColor}About ingester, please read https://github.com/ossrs/srs/wiki/v1_CN_Ingest\${BLACK}"
  51 +echo -e " | ${SrsHttpCallbackSummaryColor}About http-callback, please read https://github.com/ossrs/srs/wiki/v2_CN_HTTPCallback\${BLACK}"
  52 +echo -e " | ${SrsHttpServerSummaryColor}Aoubt embeded http-server, please read https://github.com/ossrs/srs/wiki/v2_CN_HTTPServer\${BLACK}"
  53 +echo -e " | ${SrsHttpApiSummaryColor}About http-api, please read https://github.com/ossrs/srs/wiki/v2_CN_HTTPApi\${BLACK}"
  54 +echo -e " | ${SrsStreamCasterSummaryColor}About stream-caster, please read https://github.com/ossrs/srs/wiki/v2_CN_Streamer\${BLACK}"
  55 +echo -e " | ${SrsKafkaSummaryColor}About kafka, please read https://github.com/ossrs/srs/wiki/v3_CN_Kafka\${BLACK}"
65 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" 56 echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
66 -echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}"  
67 -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"  
68 -echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLibrtmp\${BLACK}"  
69 -echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}"  
70 -echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}"  
71 -echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}"  
72 -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp, the srs-librtmp client sample\${BLACK}"  
73 -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_flv\${BLACK}"  
74 -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_rtmp\${BLACK}"  
75 -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_detect_rtmp\${BLACK}"  
76 -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}"  
77 -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"  
78 -echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info, librtmp.\${BLACK}"  
79 -echo -e " | ${SrsResearchSummaryColor} @see https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}"  
80 -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"  
81 -echo -e " |\${GREEN}tools: important tool, others @see https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}"  
82 -echo -e " | \${GREEN}./objs/srs_ingest_hls -i http://ossrs.net/live/livestream.m3u8 -y rtmp://127.0.0.1/live/livestream\${BLACK}"  
83 -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"  
84 -echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}"  
85 -echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS\${BLACK}"  
86 -echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}"  
87 -echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/ossrs/srs/wiki/v2_CN_DVR\${BLACK}"  
88 -echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}"  
89 -echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS\${BLACK}"  
90 -echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}"  
91 -echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}"  
92 -echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake\${BLACK}"  
93 -echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}"  
94 -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG\${BLACK}"  
95 -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}"  
96 -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}"  
97 -echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG\${BLACK}"  
98 -echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}"  
99 -echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/ossrs/srs/wiki/v1_CN_Ingest\${BLACK}"  
100 -echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}"  
101 -echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/ossrs/srs/wiki/v2_CN_HTTPCallback\${BLACK}"  
102 -echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}"  
103 -echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/ossrs/srs/wiki/v2_CN_HTTPServer\${BLACK}"  
104 -echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}"  
105 -echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/ossrs/srs/wiki/v2_CN_HTTPApi\${BLACK}"  
106 -echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}"  
107 -echo -e " | ${SrsStreamCasterSummaryColor}stream-caster @see: https://github.com/ossrs/srs/wiki/v2_CN_Streamer\${BLACK}"  
108 -echo -e " | ${SrsStreamCasterSummaryColor}stream-caster: start server to cast stream over other protocols.\${BLACK}"  
109 -echo -e " | ${SrsKafkaSummaryColor}kafka @see: https://github.com/ossrs/srs/wiki/v3_CN_Kafka\${BLACK}"  
110 -echo -e " | ${SrsKafkaSummaryColor}kafka: start srs kafka producer to report to kafka.\${BLACK}"  
111 -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"  
112 -echo -e "\${GREEN}binaries @see: https://github.com/ossrs/srs/wiki/v2_CN_Build\${BLACK}" 57 +echo -e "\${GREEN}binaries, please read https://github.com/ossrs/srs/wiki/v2_CN_Build\${BLACK}"
113 58
114 echo "You can:" 59 echo "You can:"
115 echo " ./objs/srs -c conf/srs.conf" 60 echo " ./objs/srs -c conf/srs.conf"
@@ -187,4 +187,4 @@ END @@ -187,4 +187,4 @@ END
187 # parent Makefile, to create module output dir before compile it. 187 # parent Makefile, to create module output dir before compile it.
188 echo " @mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 188 echo " @mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
189 189
190 -echo -n "generate utest ok"; echo '!'; 190 +echo -n "Generate utest ok"; echo '!';
@@ -208,7 +208,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -208,7 +208,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
208 MODULE_ID="MAIN" 208 MODULE_ID="MAIN"
209 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP") 209 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
210 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot} ${LibSSLRoot}) 210 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot} ${LibSSLRoot})
211 - MODULE_FILES=("srs_main_server" "srs_main_ingest_hls") 211 + MODULE_FILES=("srs_main_server")
212 DEFINES="" 212 DEFINES=""
213 # add each modules for main 213 # add each modules for main
214 for SRS_MODULE in ${SRS_MODULES[*]}; do 214 for SRS_MODULE in ${SRS_MODULES[*]}; do
@@ -277,7 +277,7 @@ fi @@ -277,7 +277,7 @@ fi
277 277
278 ##################################################################################### 278 #####################################################################################
279 # makefile 279 # makefile
280 -echo "generate Makefile" 280 +echo "Generate Makefile"
281 281
282 # backup old makefile. 282 # backup old makefile.
283 rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk && 283 rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk &&
@@ -317,11 +317,10 @@ _default: server srs_ingest_hls librtmp utest __modules $__mdefaults @@ -317,11 +317,10 @@ _default: server srs_ingest_hls librtmp utest __modules $__mdefaults
317 @bash objs/_srs_build_summary.sh 317 @bash objs/_srs_build_summary.sh
318 318
319 help: 319 help:
320 - @echo "Usage: make <help>|<clean>|<server>|<srs_ingest_hls>|<librtmp>|<utest>|<install>|<install-api>|<uninstall>" 320 + @echo "Usage: make <help>|<clean>|<server>|<librtmp>|<utest>|<install>|<install-api>|<uninstall>"
321 @echo " help display this help menu" 321 @echo " help display this help menu"
322 @echo " clean cleanup project" 322 @echo " clean cleanup project"
323 @echo " server build the srs(simple rtmp server) over st(state-threads)" 323 @echo " server build the srs(simple rtmp server) over st(state-threads)"
324 - @echo " srs_ingest_hls build the hls ingest tool of srs."  
325 @echo " librtmp build the client publish/play library, and samples" 324 @echo " librtmp build the client publish/play library, and samples"
326 @echo " utest build the utest for srs" 325 @echo " utest build the utest for srs"
327 @echo " install install srs to the prefix path" 326 @echo " install install srs to the prefix path"
@@ -353,19 +352,14 @@ echo "" >> ${SRS_WORKDIR}/${SRS_MAKEFILE} @@ -353,19 +352,14 @@ echo "" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
353 if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then 352 if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then
354 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 353 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
355 server: _prepare_dir 354 server: _prepare_dir
356 - @echo "donot build the srs(simple rtmp server) for srs-librtmp"  
357 -srs_ingest_hls: _prepare_dir  
358 - @echo "donot build the srs_ingest_hls for srs-librtmp" 355 + @echo "Ingore srs(simple rtmp server) for srs-librtmp"
359 356
360 END 357 END
361 else 358 else
362 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 359 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
363 server: _prepare_dir 360 server: _prepare_dir
364 - @echo "build the srs(simple rtmp server) over st(state-threads)" 361 + @echo "Build the srs(simple rtmp server) over ST(state-threads)"
365 \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs 362 \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs
366 -srs_ingest_hls: _prepare_dir  
367 - @echo "build the srs_ingest_hls for srs"  
368 - \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs_ingest_hls  
369 363
370 END 364 END
371 fi 365 fi
@@ -376,13 +370,13 @@ for SRS_MODULE in ${SRS_MODULES[*]}; do @@ -376,13 +370,13 @@ for SRS_MODULE in ${SRS_MODULES[*]}; do
376 if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then 370 if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then
377 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 371 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
378 $SRS_MODULE_NAME: _prepare_dir 372 $SRS_MODULE_NAME: _prepare_dir
379 - @echo "donot build the $SRS_MODULE_NAME for srs-librtmp" 373 + @echo "Ingore the $SRS_MODULE_NAME for srs-librtmp"
380 374
381 END 375 END
382 else 376 else
383 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 377 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
384 $SRS_MODULE_NAME: _prepare_dir 378 $SRS_MODULE_NAME: _prepare_dir
385 - @echo "build the $SRS_MODULE_NAME over SRS" 379 + @echo "Build the $SRS_MODULE_NAME over SRS"
386 \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} $SRS_MODULE_NAME 380 \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} $SRS_MODULE_NAME
387 381
388 END 382 END
@@ -393,13 +387,13 @@ done @@ -393,13 +387,13 @@ done
393 if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then 387 if [ $SRS_EXPORT_LIBRTMP_PROJECT != NO ]; then
394 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 388 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
395 uninstall: 389 uninstall:
396 - @echo "disable uninstall for srs-librtmp" 390 + @echo "Disable uninstall for srs-librtmp"
397 391
398 install-api: 392 install-api:
399 - @echo "disable install-api for srs-librtmp" 393 + @echo "Disable install-api for srs-librtmp"
400 394
401 install: 395 install:
402 - @echo "disable install for srs-librtmp" 396 + @echo "Disable install for srs-librtmp"
403 397
404 END 398 END
405 else 399 else
@@ -409,47 +403,47 @@ uninstall: @@ -409,47 +403,47 @@ uninstall:
409 @rm -rf \$(SRS_PREFIX) 403 @rm -rf \$(SRS_PREFIX)
410 404
411 install-api: install 405 install-api: install
412 - @echo "mkdir \$(__REAL_INSTALL)" 406 + @echo "Now mkdir \$(__REAL_INSTALL)"
413 @mkdir -p \$(__REAL_INSTALL) 407 @mkdir -p \$(__REAL_INSTALL)
414 - @echo "copy binary files" 408 + @echo "Now copy binary files"
415 @mkdir -p \$(__REAL_INSTALL)/research/api-server 409 @mkdir -p \$(__REAL_INSTALL)/research/api-server
416 @cp research/api-server/server.py \$(__REAL_INSTALL)/research/api-server 410 @cp research/api-server/server.py \$(__REAL_INSTALL)/research/api-server
417 @mkdir -p \$(__REAL_INSTALL)/objs/ffmpeg/bin 411 @mkdir -p \$(__REAL_INSTALL)/objs/ffmpeg/bin
418 @cp objs/ffmpeg/bin/ffmpeg \$(__REAL_INSTALL)/objs/ffmpeg/bin 412 @cp objs/ffmpeg/bin/ffmpeg \$(__REAL_INSTALL)/objs/ffmpeg/bin
419 - @echo "copy html files" 413 + @echo "Now copy html files"
420 @mkdir -p \$(__REAL_INSTALL)/research/api-server/static-dir/players 414 @mkdir -p \$(__REAL_INSTALL)/research/api-server/static-dir/players
421 @cp research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/research/api-server/static-dir 415 @cp research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/research/api-server/static-dir
422 @cp research/api-server/static-dir/index.html \$(__REAL_INSTALL)/research/api-server/static-dir 416 @cp research/api-server/static-dir/index.html \$(__REAL_INSTALL)/research/api-server/static-dir
423 @cp -r research/api-server/static-dir/players/* \$(__REAL_INSTALL)/research/api-server/static-dir/players 417 @cp -r research/api-server/static-dir/players/* \$(__REAL_INSTALL)/research/api-server/static-dir/players
424 - @echo "copy init.d script files" 418 + @echo "Now copy init.d script files"
425 @mkdir -p \$(__REAL_INSTALL)/etc/init.d 419 @mkdir -p \$(__REAL_INSTALL)/etc/init.d
426 @cp etc/init.d/srs-api \$(__REAL_INSTALL)/etc/init.d 420 @cp etc/init.d/srs-api \$(__REAL_INSTALL)/etc/init.d
427 @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs-api 421 @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs-api
428 @echo "" 422 @echo ""
429 - @echo "api installed, to link and start api:" 423 + @echo "The api installed, to link and start api:"
430 @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api" 424 @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api"
431 @echo " /etc/init.d/srs-api start" 425 @echo " /etc/init.d/srs-api start"
432 @echo " http://\$(shell bash auto/local_ip.sh):8085" 426 @echo " http://\$(shell bash auto/local_ip.sh):8085"
433 @echo "@see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService" 427 @echo "@see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService"
434 428
435 install: 429 install:
436 - @echo "mkdir \$(__REAL_INSTALL)" 430 + @echo "Now mkdir \$(__REAL_INSTALL)"
437 @mkdir -p \$(__REAL_INSTALL) 431 @mkdir -p \$(__REAL_INSTALL)
438 - @echo "make the http root dir" 432 + @echo "Now make the http root dir"
439 @mkdir -p \$(__REAL_INSTALL)/objs/nginx/html 433 @mkdir -p \$(__REAL_INSTALL)/objs/nginx/html
440 @cp research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html 434 @cp research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html
441 - @echo "copy binary files" 435 + @echo "Now copy binary files"
442 @mkdir -p \$(__REAL_INSTALL)/objs 436 @mkdir -p \$(__REAL_INSTALL)/objs
443 @cp objs/srs \$(__REAL_INSTALL)/objs 437 @cp objs/srs \$(__REAL_INSTALL)/objs
444 - @echo "copy srs conf files" 438 + @echo "Now copy srs conf files"
445 @mkdir -p \$(__REAL_INSTALL)/conf 439 @mkdir -p \$(__REAL_INSTALL)/conf
446 @cp conf/*.conf \$(__REAL_INSTALL)/conf 440 @cp conf/*.conf \$(__REAL_INSTALL)/conf
447 - @echo "copy init.d script files" 441 + @echo "Now copy init.d script files"
448 @mkdir -p \$(__REAL_INSTALL)/etc/init.d 442 @mkdir -p \$(__REAL_INSTALL)/etc/init.d
449 @cp etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d 443 @cp etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d
450 @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs 444 @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs
451 @echo "" 445 @echo ""
452 - @echo "srs installed, to link and start srs:" 446 + @echo "SRS is installed, to link and start srs:"
453 @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs" 447 @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs"
454 @echo " /etc/init.d/srs start" 448 @echo " /etc/init.d/srs start"
455 @echo "@see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService" 449 @echo "@see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService"
@@ -461,16 +455,16 @@ fi @@ -461,16 +455,16 @@ fi
461 if [ $SRS_LIBRTMP = YES ]; then 455 if [ $SRS_LIBRTMP = YES ]; then
462 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 456 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
463 librtmp: server 457 librtmp: server
464 - @echo "build the client publish/play library." 458 + @echo "Building the client publish/play library."
465 \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} librtmp 459 \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} librtmp
466 - @echo "build the srs-librtmp sample" 460 + @echo "Building the srs-librtmp example."
467 (cd research/librtmp; \$(MAKE) ${SrsLibrtmpSampleEntry}) 461 (cd research/librtmp; \$(MAKE) ${SrsLibrtmpSampleEntry})
468 462
469 END 463 END
470 else 464 else
471 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 465 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
472 librtmp: server 466 librtmp: server
473 - @echo "srs-librtmp is disabled, ignore." 467 + @echo "Ignore srs-librtmp for it's disabled."
474 468
475 END 469 END
476 fi 470 fi
@@ -478,15 +472,15 @@ fi @@ -478,15 +472,15 @@ fi
478 if [ $SRS_UTEST = YES ]; then 472 if [ $SRS_UTEST = YES ]; then
479 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 473 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
480 utest: server 474 utest: server
481 - @echo "build the utest for srs" 475 + @echo "Building the utest for srs"
482 ${SrsUtestMakeEntry} 476 ${SrsUtestMakeEntry}
483 - @echo "utest for srs build success" 477 + @echo "The utest is built ok."
484 478
485 END 479 END
486 else 480 else
487 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} 481 cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
488 utest: server 482 utest: server
489 - @echo "utest is disabled, ignore" 483 + @echo "Ignore utest for it's disabled."
490 484
491 END 485 END
492 fi 486 fi
@@ -501,7 +495,7 @@ END @@ -501,7 +495,7 @@ END
501 cat ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk >> ${SRS_WORKDIR}/${SRS_MAKEFILE} && 495 cat ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk >> ${SRS_WORKDIR}/${SRS_MAKEFILE} &&
502 rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk 496 rm -f ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk
503 497
504 -echo 'configure ok! ' 498 +echo 'Configure ok! '
505 499
506 ##################################################################################### 500 #####################################################################################
507 # when configure success, prepare build 501 # when configure success, prepare build
@@ -517,132 +511,132 @@ fi @@ -517,132 +511,132 @@ fi
517 # summary 511 # summary
518 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 512 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
519 echo "" 513 echo ""
520 - echo "configure summary:" 514 + echo "Configure summary:"
521 echo " ${SRS_AUTO_USER_CONFIGURE}" 515 echo " ${SRS_AUTO_USER_CONFIGURE}"
522 echo " ${SRS_AUTO_CONFIGURE}" 516 echo " ${SRS_AUTO_CONFIGURE}"
523 if [ $SRS_HLS = YES ]; then 517 if [ $SRS_HLS = YES ]; then
524 - echo -e "${GREEN}HLS is enabled${BLACK}" 518 + echo -e "${GREEN}HLS is enabled.${BLACK}"
525 else 519 else
526 - echo -e "${YELLOW}warning: without HLS support${BLACK}" 520 + echo -e "${YELLOW}Warning: HLS is disabled.${BLACK}"
527 fi 521 fi
528 if [ $SRS_STREAM_CASTER = YES ]; then 522 if [ $SRS_STREAM_CASTER = YES ]; then
529 - echo -e "${YELLOW}Experiment: StreamCaster is enabled${BLACK}" 523 + echo -e "${YELLOW}Experiment: StreamCaster is enabled.${BLACK}"
530 else 524 else
531 - echo -e "${GREEN}note: without StreamCaster support${BLACK}" 525 + echo -e "${GREEN}Note: StreamCaster is disabled.${BLACK}"
532 fi 526 fi
533 if [ $SRS_KAFKA = YES ]; then 527 if [ $SRS_KAFKA = YES ]; then
534 - echo -e "${GREEN}Kafka is enabled${BLACK}" 528 + echo -e "${GREEN}Kafka is enabled.${BLACK}"
535 else 529 else
536 - echo -e "${YELLOW}warning: without Kafka support${BLACK}" 530 + echo -e "${YELLOW}Warning: Kafka is disabled.${BLACK}"
537 fi 531 fi
538 if [ $SRS_HDS = YES ]; then 532 if [ $SRS_HDS = YES ]; then
539 - echo -e "${YELLOW}Experiment: HDS is enabled${BLACK}" 533 + echo -e "${YELLOW}Experiment: HDS is enabled.${BLACK}"
540 else 534 else
541 - echo -e "${GREEN}warning: without HDS support${BLACK}" 535 + echo -e "${GREEN}Warning: HDS is disabled.${BLACK}"
542 fi 536 fi
543 if [ $SRS_NGINX = YES ]; then 537 if [ $SRS_NGINX = YES ]; then
544 - echo -e "${GREEN}Nginx http server is enabled${BLACK}" 538 + echo -e "${GREEN}Nginx is enabled.${BLACK}"
545 else 539 else
546 - echo -e "${GREEN}note: Nginx http server is disabled${BLACK}" 540 + echo -e "${GREEN}Note: Nginx is disabled.${BLACK}"
547 fi 541 fi
548 if [ $SRS_DVR = YES ]; then 542 if [ $SRS_DVR = YES ]; then
549 - echo -e "${GREEN}DVR is enabled${BLACK}" 543 + echo -e "${GREEN}DVR is enabled.${BLACK}"
550 else 544 else
551 - echo -e "${YELLOW}warning: without DVR support${BLACK}" 545 + echo -e "${YELLOW}Warning: DVR is disabled.${BLACK}"
552 fi 546 fi
553 if [ $SRS_SSL = YES ]; then 547 if [ $SRS_SSL = YES ]; then
554 - echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}" 548 + echo -e "${GREEN}RTMP complex handshake is enabled${BLACK}"
555 else 549 else
556 - echo -e "${YELLOW}warning: without rtmp complex handshake support, donot support h264/aac to adobe flash player${BLACK}" 550 + echo -e "${YELLOW}Warning: RTMP complex handshake is disabled, flash cann't play h264/aac.${BLACK}"
557 fi 551 fi
558 if [ $SRS_FFMPEG_TOOL = YES ]; then 552 if [ $SRS_FFMPEG_TOOL = YES ]; then
559 - echo -e "${GREEN}transcode/mux/ingest tool FFMPEG is enabled${BLACK}" 553 + echo -e "${GREEN}The FFMPEG tool is enabled.${BLACK}"
560 else 554 else
561 - echo -e "${YELLOW}warning: without transcode/mux/ingest tool FFMPEG support${BLACK}" 555 + echo -e "${YELLOW}Warning: The FFMPEG tool is disabled, please use other tools for transcode/mux/ingest.${BLACK}"
562 fi 556 fi
563 if [ $SRS_TRANSCODE = YES ]; then 557 if [ $SRS_TRANSCODE = YES ]; then
564 - echo -e "${GREEN}transcoding RTMP stream is enabled${BLACK}" 558 + echo -e "${GREEN}The transcoding is enabled${BLACK}"
565 else 559 else
566 - echo -e "${YELLOW}warning: without transcoding RTMP stream support${BLACK}" 560 + echo -e "${YELLOW}Warning: The transcoding is disabled.${BLACK}"
567 fi 561 fi
568 if [ $SRS_INGEST = YES ]; then 562 if [ $SRS_INGEST = YES ]; then
569 - echo -e "${GREEN}ingest file/stream/device is enabled${BLACK}" 563 + echo -e "${GREEN}The ingesting is enabled.${BLACK}"
570 else 564 else
571 - echo -e "${YELLOW}warning: without ingest file/stream/device support${BLACK}" 565 + echo -e "${YELLOW}Warning: The ingesting is disabled.${BLACK}"
572 fi 566 fi
573 if [ $SRS_HTTP_CALLBACK = YES ]; then 567 if [ $SRS_HTTP_CALLBACK = YES ]; then
574 - echo -e "${GREEN}http hooks callback over CherryPy is enabled${BLACK}" 568 + echo -e "${GREEN}The http-callback is enabled${BLACK}"
575 else 569 else
576 - echo -e "${YELLOW}warning: without http hooks callback over CherryPy support${BLACK}" 570 + echo -e "${YELLOW}Warning: The http-callback is disabled.${BLACK}"
577 fi 571 fi
578 if [ $SRS_HTTP_SERVER = YES ]; then 572 if [ $SRS_HTTP_SERVER = YES ]; then
579 - echo -e "${GREEN}http server to delivery http stream is enabled${BLACK}" 573 + echo -e "${GREEN}Embeded HTTP server for HTTP-FLV/HLS is enabled.${BLACK}"
580 else 574 else
581 - echo -e "${YELLOW}warning: without http server to delivery http stream support${BLACK}" 575 + echo -e "${YELLOW}Warning: Embeded HTTP server is disabled, HTTP-FLV is disabled, please use nginx to delivery HLS.${BLACK}"
582 fi 576 fi
583 if [ $SRS_HTTP_API = YES ]; then 577 if [ $SRS_HTTP_API = YES ]; then
584 - echo -e "${GREEN}http api to manage server is enabled${BLACK}" 578 + echo -e "${GREEN}The HTTP API is enabled${BLACK}"
585 else 579 else
586 - echo -e "${YELLOW}warning: without http api to manage server support${BLACK}" 580 + echo -e "${YELLOW}Warning: The HTTP API is disabled.${BLACK}"
587 fi 581 fi
588 if [ $SRS_LIBRTMP = YES ]; then 582 if [ $SRS_LIBRTMP = YES ]; then
589 - echo -e "${GREEN}srs-librtmp for client is enabled${BLACK}" 583 + echo -e "${GREEN}The client-side srs-librtmp is enabled.${BLACK}"
590 else 584 else
591 - echo -e "${YELLOW}note: srs-librtmp for client is disabled${BLACK}" 585 + echo -e "${YELLOW}Note: The client-side srs-librtmp is disabled.${BLACK}"
592 fi 586 fi
593 if [ $SRS_RESEARCH = YES ]; then 587 if [ $SRS_RESEARCH = YES ]; then
594 - echo -e "${GREEN}research tools are builded${BLACK}" 588 + echo -e "${GREEN}The research tools are enabled.${BLACK}"
595 else 589 else
596 - echo -e "${GREEN}note: research tools are not builded${BLACK}" 590 + echo -e "${GREEN}Note: The research tools are disabled.${BLACK}"
597 fi 591 fi
598 if [ $SRS_UTEST = YES ]; then 592 if [ $SRS_UTEST = YES ]; then
599 - echo -e "${GREEN}utest for srs are builded${BLACK}" 593 + echo -e "${GREEN}The utests are enabled.${BLACK}"
600 else 594 else
601 - echo -e "${YELLOW}note: utest for srs are not builded${BLACK}" 595 + echo -e "${YELLOW}Note: The utests are disabled.${BLACK}"
602 fi 596 fi
603 if [ $SRS_GPERF = YES ]; then 597 if [ $SRS_GPERF = YES ]; then
604 - echo -e "${GREEN}gperf(tcmalloc) for srs are builded${BLACK}" 598 + echo -e "${GREEN}The gperf(tcmalloc) is enabled.${BLACK}"
605 else 599 else
606 - echo -e "${GREEN}note: gperf(tcmalloc) for srs are not builded${BLACK}" 600 + echo -e "${GREEN}Note: The gperf(tcmalloc) is disabled.${BLACK}"
607 fi 601 fi
608 if [ $SRS_GPERF_MC = YES ]; then 602 if [ $SRS_GPERF_MC = YES ]; then
609 - echo -e "${YELLOW}gmc(gperf memory check) for srs are builded -- Performance may suffer${BLACK}" 603 + echo -e "${YELLOW}The gmc(gperf memory check) is enabled, performance may suffer.${BLACK}"
610 else 604 else
611 - echo -e "${GREEN}note: gmc(gperf memory check) for srs are not builded${BLACK}" 605 + echo -e "${GREEN}Note: The gmc(gperf memory check) is disabled.${BLACK}"
612 fi 606 fi
613 if [ $SRS_GPERF_MD = YES ]; then 607 if [ $SRS_GPERF_MD = YES ]; then
614 - echo -e "${YELLOW}gmd(gperf memory defense) for srs are builded -- Performance may suffer${BLACK}" 608 + echo -e "${YELLOW}The gmd(gperf memory defense) is enabled, performance may suffer.${BLACK}"
615 else 609 else
616 - echo -e "${GREEN}note: gmd(gperf memory defense) for srs are not builded${BLACK}" 610 + echo -e "${GREEN}Note: The gmd(gperf memory defense) is disabled.${BLACK}"
617 fi 611 fi
618 if [ $SRS_GPERF_MP = YES ]; then 612 if [ $SRS_GPERF_MP = YES ]; then
619 - echo -e "${YELLOW}gmp(gperf memory profile) for srs are builded -- Performance may suffer${BLACK}" 613 + echo -e "${YELLOW}The gmp(gperf memory profile) is enabled, performance may suffer.${BLACK}"
620 else 614 else
621 - echo -e "${GREEN}note: gmp(gperf memory profile) for srs are not builded${BLACK}" 615 + echo -e "${GREEN}Note: The gmp(gperf memory profile) is disabled.${BLACK}"
622 fi 616 fi
623 if [ $SRS_GPERF_CP = YES ]; then 617 if [ $SRS_GPERF_CP = YES ]; then
624 - echo -e "${YELLOW}gcp(gperf cpu profile) for srs are builded -- Performance may suffer${BLACK}" 618 + echo -e "${YELLOW}The gcp(gperf cpu profile) is enabled, performance may suffer.${BLACK}"
625 else 619 else
626 - echo -e "${GREEN}note: gcp(gperf cpu profile) for srs are not builded${BLACK}" 620 + echo -e "${GREEN}Note: The gcp(gperf cpu profile) is disabled.${BLACK}"
627 fi 621 fi
628 if [ $SRS_GPROF = YES ]; then 622 if [ $SRS_GPROF = YES ]; then
629 - echo -e "${YELLOW}gprof(GNU profile tool) for srs are builded -- Performance may suffer${BLACK}" 623 + echo -e "${YELLOW}The gprof(GNU profile tool) is enabled, performance may suffer.${BLACK}"
630 else 624 else
631 - echo -e "${GREEN}note: gprof(GNU profile tool) for srs are not builded${BLACK}" 625 + echo -e "${GREEN}Note: The gprof(GNU profile tool) is disabled.${BLACK}"
632 fi 626 fi
633 if [ $SRS_ARM_UBUNTU12 = YES ]; then 627 if [ $SRS_ARM_UBUNTU12 = YES ]; then
634 - echo -e "${GREEN}arm-ubuntu12(armhf, v7cpu) for srs are builded${BLACK}" 628 + echo -e "${GREEN}The cross-build arm-ubuntu12(armhf, v7cpu) is enabled.${BLACK}"
635 else 629 else
636 - echo -e "${GREEN}note: arm-ubuntu12(armhf, v7cpu) for srs are not builded${BLACK}" 630 + echo -e "${GREEN}Note: The cross-build arm-ubuntu12(armhf, v7cpu)is disabled.${BLACK}"
637 fi 631 fi
638 if [ $SRS_MIPS_UBUNTU12 = YES ]; then 632 if [ $SRS_MIPS_UBUNTU12 = YES ]; then
639 - echo -e "${GREEN}mips-ubuntu12 for srs are builded${BLACK}" 633 + echo -e "${GREEN}The mips-ubuntu12 is enabled.${BLACK}"
640 else 634 else
641 - echo -e "${GREEN}note: mips-ubuntu12 for srs are not builded${BLACK}" 635 + echo -e "${GREEN}Note: The mips-ubuntu12 is disabled.${BLACK}"
642 fi 636 fi
643 # add each modules for application 637 # add each modules for application
644 for SRS_MODULE in ${SRS_MODULES[*]}; do 638 for SRS_MODULE in ${SRS_MODULES[*]}; do
645 - echo -e "${GREEN}module: $SRS_MODULE${BLACK}" 639 + echo -e "${GREEN}Enable module: $SRS_MODULE${BLACK}"
646 done 640 done
647 fi 641 fi
648 642
@@ -652,7 +646,7 @@ fi @@ -652,7 +646,7 @@ fi
652 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 646 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
653 ip=`ifconfig|grep "inet addr"| grep -v "127.0.0.1"|awk '{print $2}'|awk -F ':' 'NR==1 {print $2}'` 647 ip=`ifconfig|grep "inet addr"| grep -v "127.0.0.1"|awk '{print $2}'|awk -F ':' 'NR==1 {print $2}'`
654 echo "" 648 echo ""
655 - echo "to run 3rdparty application:" 649 + echo "You can run 3rdparty applications:"
656 if [ $SRS_NGINX = YES ]; then 650 if [ $SRS_NGINX = YES ]; then
657 echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls" 651 echo "\" sudo ./objs/nginx/sbin/nginx \" to start the nginx http server for hls"
658 fi 652 fi
@@ -663,14 +657,14 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -663,14 +657,14 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
663 echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server" 657 echo -e "\" python ./research/api-server/server.py 8085 \" to start the api-server"
664 fi 658 fi
665 echo "" 659 echo ""
666 - echo "to build:" 660 + echo "You can build SRS:"
667 echo "\" make \" to build the srs(simple rtmp server)." 661 echo "\" make \" to build the srs(simple rtmp server)."
668 echo "\" make help \" to get the usage of make" 662 echo "\" make help \" to get the usage of make"
669 else 663 else
670 # for srs-librtmp single file, 664 # for srs-librtmp single file,
671 # package the whole project to srs_librtmp.h and srs_librtmp.cpp 665 # package the whole project to srs_librtmp.h and srs_librtmp.cpp
672 if [ $SRS_EXPORT_LIBRTMP_SINGLE != NO ]; then 666 if [ $SRS_EXPORT_LIBRTMP_SINGLE != NO ]; then
673 - echo "package the whole project to srs_librtmp.h and srs_librtmp.cpp" 667 + echo "Packaging the whole project to srs_librtmp.h and srs_librtmp.cpp"
674 . $SRS_EXPORT_LIBRTMP_SINGLE/auto/generate-srs-librtmp-single.sh 668 . $SRS_EXPORT_LIBRTMP_SINGLE/auto/generate-srs-librtmp-single.sh
675 echo -e "${GREEN}Please use the srs-librtmp files: ${BLACK}" 669 echo -e "${GREEN}Please use the srs-librtmp files: ${BLACK}"
676 echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/srs_librtmp.h ${BLACK}" 670 echo -e "${GREEN} $SRS_EXPORT_LIBRTMP_PROJECT/srs_librtmp.h ${BLACK}"
@@ -361,6 +361,8 @@ @@ -361,6 +361,8 @@
361 3C663F0B1AB0155100286D8B /* srs_play.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_play.c; path = ../../../research/librtmp/srs_play.c; sourceTree = "<group>"; }; 361 3C663F0B1AB0155100286D8B /* srs_play.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_play.c; path = ../../../research/librtmp/srs_play.c; sourceTree = "<group>"; };
362 3C663F0C1AB0155100286D8B /* srs_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_publish.c; path = ../../../research/librtmp/srs_publish.c; sourceTree = "<group>"; }; 362 3C663F0C1AB0155100286D8B /* srs_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_publish.c; path = ../../../research/librtmp/srs_publish.c; sourceTree = "<group>"; };
363 3C663F0D1AB0155100286D8B /* srs_rtmp_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_rtmp_dump.c; path = ../../../research/librtmp/srs_rtmp_dump.c; sourceTree = "<group>"; }; 363 3C663F0D1AB0155100286D8B /* srs_rtmp_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_rtmp_dump.c; path = ../../../research/librtmp/srs_rtmp_dump.c; sourceTree = "<group>"; };
  364 + 3C6673CF1DF7B93200A6DF57 /* readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = readme.txt; path = ../../../modules/readme.txt; sourceTree = "<group>"; };
  365 + 3C6673D11DF7B95E00A6DF57 /* config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = config; path = "../../../modules/hls-ingester/config"; sourceTree = "<group>"; };
364 3C689F911AB6AAAC00C9CEEE /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common.h; path = "../../objs/st-1.9/common.h"; sourceTree = "<group>"; }; 366 3C689F911AB6AAAC00C9CEEE /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = common.h; path = "../../objs/st-1.9/common.h"; sourceTree = "<group>"; };
365 3C689F921AB6AAAC00C9CEEE /* event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = event.c; path = "../../objs/st-1.9/event.c"; sourceTree = "<group>"; }; 367 3C689F921AB6AAAC00C9CEEE /* event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = event.c; path = "../../objs/st-1.9/event.c"; sourceTree = "<group>"; };
366 3C689F931AB6AAAC00C9CEEE /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io.c; path = "../../objs/st-1.9/io.c"; sourceTree = "<group>"; }; 368 3C689F931AB6AAAC00C9CEEE /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io.c; path = "../../objs/st-1.9/io.c"; sourceTree = "<group>"; };
@@ -811,6 +813,14 @@ @@ -811,6 +813,14 @@
811 path = srs_xcode; 813 path = srs_xcode;
812 sourceTree = "<group>"; 814 sourceTree = "<group>";
813 }; 815 };
  816 + 3C6673D01DF7B95000A6DF57 /* hls-ingester */ = {
  817 + isa = PBXGroup;
  818 + children = (
  819 + 3C6673D11DF7B95E00A6DF57 /* config */,
  820 + );
  821 + name = "hls-ingester";
  822 + sourceTree = "<group>";
  823 + };
814 3C689F901AB6AA9100C9CEEE /* st-1.9 */ = { 824 3C689F901AB6AA9100C9CEEE /* st-1.9 */ = {
815 isa = PBXGroup; 825 isa = PBXGroup;
816 children = ( 826 children = (
@@ -831,7 +841,8 @@ @@ -831,7 +841,8 @@
831 3C96ADC41B00A71000885304 /* modules */ = { 841 3C96ADC41B00A71000885304 /* modules */ = {
832 isa = PBXGroup; 842 isa = PBXGroup;
833 children = ( 843 children = (
834 - 3C24ECCA1C3A42D800460622 /* readme.txt */, 844 + 3C6673D01DF7B95000A6DF57 /* hls-ingester */,
  845 + 3C6673CF1DF7B93200A6DF57 /* readme.txt */,
835 ); 846 );
836 name = modules; 847 name = modules;
837 sourceTree = "<group>"; 848 sourceTree = "<group>";
  1 +
  2 +# The module to ingest hls to replace ffmpeg with better behavior.
  3 +SRS_MODULE_NAME=("hls-ingester")
  4 +SRS_MODULE_MAIN=("srs_main_ingest_hls")
  5 +SRS_MODULE_APP=()
  6 +SRS_MODULE_DEFINES=""
  7 +SRS_MODULE_MAKEFILE=""
@@ -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 3 32 #define VERSION_MAJOR 3
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 221 34 +#define VERSION_REVISION 7
35 35
36 // generated by configure, only macros. 36 // generated by configure, only macros.
37 #include <srs_auto_headers.hpp> 37 #include <srs_auto_headers.hpp>