diff --git a/trunk/configure b/trunk/configure index b77baca7b..b57700e2d 100755 --- a/trunk/configure +++ b/trunk/configure @@ -462,7 +462,7 @@ mv ${SRS_WORKDIR}/${SRS_MAKEFILE} ${SRS_WORKDIR}/${SRS_MAKEFILE}.bk # generate phony header cat << END > ${SRS_WORKDIR}/${SRS_MAKEFILE} .PHONY: default _default install help clean destroy server srs_ingest_hls utest _prepare_dir $__mphonys -.PHONY: clean_srs clean_modules clean_openssl clean_nginx clean_cherrypy clean_srtp2 clean_opus clean_ffmpeg clean_st +.PHONY: clean_srs clean_modules clean_openssl clean_srtp2 clean_opus clean_ffmpeg clean_st .PHONY: st ffmpeg # install prefix. @@ -505,7 +505,6 @@ doclean: (cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest $__mcleanups) (cd ${SRS_OBJS_DIR} && rm -rf src/* include lib) (mkdir -p ${SRS_OBJS_DIR}/utest && cd ${SRS_OBJS_DIR}/utest && rm -rf *.o *.a) - (cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players) clean: clean_srs clean_modules @@ -541,12 +540,6 @@ clean_st: (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf st-srs) @echo "Please rebuild ST by: ./configure" -clean_nginx: - (cd ${SRS_OBJS_DIR} && rm -rf nginx) - -clean_cherrypy: - (cd research/api-server/static-dir && rm -rf crossdomain.xml forward live players) - st: (cd ${SRS_OBJS_DIR} && rm -f srs srs_utest) (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM}/st-srs && \$(MAKE) clean && \$(MAKE) ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}") @@ -587,7 +580,11 @@ 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 @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..ee4b6d739 100755 --- a/trunk/scripts/package.sh +++ b/trunk/scripts/package.sh @@ -153,18 +153,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" (