Package players and console to zip and docker. 3.0.160

README.md

@@ -170,6 +170,7 @@ Other documents:
 ## V3 changes
 
 * <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-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

trunk/scripts/package.sh

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

trunk/src/core/srs_core_version3.hpp

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