external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 11:21:52 +00:00
Code Issues Releases Wiki Activity

Package players and console to zip and docker. 3.0.160

Browse source
This commit is contained in:
winlin 2021-04-24 18:28:31 +08:00
parent 44965da9af
commit 08500fe162
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -170,6 +170,7 @@ Other documents:
## V3 changes ## V3 changes
* <strong>v3.0, 2021-04-24, [3.0 release4(3.0.159)][r3.0r4] released. 122750 lines.</strong> * <strong>v3.0, 2021-04-24, [3.0 release4(3.0.159)][r3.0r4] released. 122750 lines.</strong>
* v3.0, 2021-04-24, Package players and console to zip and docker. 3.0.160
* v3.0, 2021-04-24, Add srs-console to research/console. 3.0.159 * v3.0, 2021-04-24, Add srs-console to research/console. 3.0.159
* v3.0, 2021-03-05, Refine usage to docker by default. 3.0.158 * v3.0, 2021-03-05, Refine usage to docker by default. 3.0.158
* v3.0, 2021-01-07, Change id from int to string for the statistics. 3.0.157 * v3.0, 2021-01-07, Change id from int to string for the statistics. 3.0.157

21
trunk/scripts/package.sh
View file

@ -17,8 +17,6 @@ MIPS=NO
# #
EMBEDED=NO EMBEDED=NO
JOBS=1 JOBS=1
#
SRS_CONSOLE=
################################################################################## ##################################################################################
################################################################################## ##################################################################################
@ -43,7 +41,6 @@ do
--arm) ARM=YES ;; --arm) ARM=YES ;;
--pi) PI=YES ;; --pi) PI=YES ;;
--jobs) JOBS=$value ;; --jobs) JOBS=$value ;;
--console) SRS_CONSOLE=$value ;;
*) *)
echo "$0: error: invalid option \"$option\", @see $0 --help" echo "$0: error: invalid option \"$option\", @see $0 --help"
@ -157,14 +154,16 @@ ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "install srs failed"; exit $ret;
ok_msg "install srs success" ok_msg "install srs success"
# Copy srs-console # Copy srs-console
if [[ $SRS_CONSOLE != "" ]]; then HTTP_HOME="${package_dir}/${INSTALL}/objs/nginx/html/"
HTTP_HOME="objs/nginx/html/" (
CONSOLE_HOME="trunk/research/console" cp $work_dir/research/api-server/static-dir/index.html ${HTTP_HOME} &&
cp -R $SRS_CONSOLE/index.html ${package_dir}/${INSTALL}/${HTTP_HOME} >> $log 2>&1 cp $work_dir/research/api-server/static-dir/favicon.ico ${HTTP_HOME} &&
cp -R $SRS_CONSOLE/${CONSOLE_HOME} ${package_dir}/${INSTALL}/${HTTP_HOME} >> $log 2>&1 cp $work_dir/research/api-server/static-dir/crossdomain.xml ${HTTP_HOME} &&
ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "copy console files failed"; exit $ret; fi cp -R $work_dir/research/players ${HTTP_HOME} &&
ok_msg "copy console files success" cp -R $work_dir/research/console ${HTTP_HOME}
fi ) >> $log 2>&1
ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "copy utilities failed"; exit $ret; fi
ok_msg "copy utilities success"
# copy extra files to package. # copy extra files to package.
ok_msg "start copy extra files to package" ok_msg "start copy extra files to package"

2
trunk/src/core/srs_core_version3.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION3_HPP #ifndef SRS_CORE_VERSION3_HPP
#define SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP
#define SRS_VERSION3_REVISION 159 #define SRS_VERSION3_REVISION 160
#endif #endif