From dea613623832dda1842bf0b44737677eeeb31fc7 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 3 May 2021 08:49:16 +0800
Subject: [PATCH] Copy demos to SRS release

---
 trunk/configure          |  5 +++++
 trunk/scripts/package.sh | 14 --------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/trunk/configure b/trunk/configure
index 9c45da263..9c151fa75 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -592,7 +592,12 @@ install:
 	@mkdir -p \$(__REAL_INSTALL)
 	@echo "Now make the http root dir"
 	@mkdir -p \$(__REAL_INSTALL)/objs/nginx/html
+	@cp -f research/api-server/static-dir/index.html \$(__REAL_INSTALL)/objs/nginx/html
 	@cp -f research/api-server/static-dir/crossdomain.xml \$(__REAL_INSTALL)/objs/nginx/html
+	@cp -f research/api-server/static-dir/favicon.ico \$(__REAL_INSTALL)/objs/nginx/html
+	@cp -Rf research/players \$(__REAL_INSTALL)/objs/nginx/html/
+	@cp -Rf research/console \$(__REAL_INSTALL)/objs/nginx/html/
+	@cp -Rf 3rdparty/signaling/www/demos \$(__REAL_INSTALL)/objs/nginx/html/
 	@echo "Now copy binary files"
 	@mkdir -p \$(__REAL_INSTALL)/objs
 	@cp -f objs/srs \$(__REAL_INSTALL)/objs
diff --git a/trunk/scripts/package.sh b/trunk/scripts/package.sh
index 8627989af..3768b54ba 100755
--- a/trunk/scripts/package.sh
+++ b/trunk/scripts/package.sh
@@ -59,8 +59,6 @@ if [ $help = yes ]; then
   --pi                     for pi platform, configure/make/package.
   --x86-64                 alias for --x86-x64.
   --jobs                   Set the configure and make jobs.
-
-  --console                The path for https://github.com/ossrs/srs-console
 END
     exit 0
 fi
@@ -153,18 +151,6 @@ ok_msg "start install srs"
 ret=$?; if [[ 0 -ne ${ret} ]]; then failed_msg "install srs failed"; exit $ret; fi
 ok_msg "install srs success"
 
-# Copy srs-console
-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"
 (