From 056fcd292856caf2a5069ed76b09ec26c9e99df4 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 29 Mar 2020 19:06:51 +0800 Subject: [PATCH] Refine clean script --- trunk/auto/depends.sh | 9 ++++++--- trunk/configure | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 3aa1a9f9b..8fc230bf2 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -305,7 +305,10 @@ SED="sed_utility" && echo "SED is $SED" function _srs_link_file() { - tmp_dir=$1; tmp_dest=$2; tmp_prefix=$3 + tmp_dir=$1; if [[ $tmp_dir != *'/' ]]; then tmp_dir+='/'; fi + tmp_dest=$2; if [[ $tmp_dest != *'/' ]]; then tmp_dest+='/'; fi + tmp_prefix=$3; if [[ $tmp_prefix != *'/' ]]; then tmp_prefix+='/'; fi + echo "LINK files at dir: $tmp_dir, dest: $tmp_dest, prefix: $tmp_prefix, pwd: `pwd`" for file in `(cd $tmp_dir && find . -maxdepth 1 -type f ! -name '*.o' ! -name '*.d' ! -name '*.log')`; do basefile=`basename $file` && @@ -357,7 +360,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then # Create a hidden directory .src cd ${SRS_OBJS}/${SRS_PLATFORM}/st-srs && ln -sf ../../../3rdparty/st-srs .src && # Link source files under .src - _srs_link_file .src/ ./ && + _srs_link_file .src/ ./ ./ && for dir in `(cd .src && find . -maxdepth 1 -type d|grep '\./')`; do dir=`basename $dir` && mkdir -p $dir && _srs_link_file .src/$dir/ $dir/ ../ done && @@ -590,7 +593,7 @@ if [[ $SRS_EXPORT_LIBRTMP_PROJECT == NO && $SRS_RTC == YES ]]; then # Create a hidden directory .src cd ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4.2-fit && ABS_OBJS=`(cd .. && pwd)` && ln -sf ../../../3rdparty/ffmpeg-4.2-fit .src && # Link source files under .src - _srs_link_file .src/ ./ && + _srs_link_file .src/ ./ ./ && for dir in `(cd .src && find . -maxdepth 1 -type d|grep '\./')`; do dir=`basename $dir` && mkdir -p $dir && _srs_link_file .src/$dir/ $dir/ ../ && for dir2 in `(cd .src/$dir && find . -maxdepth 1 -type d|grep '\./')`; do diff --git a/trunk/configure b/trunk/configure index fa927a2d9..bd8e6f2e4 100755 --- a/trunk/configure +++ b/trunk/configure @@ -497,7 +497,9 @@ destroy: clean_st clean_openssl clean_ffmpeg clean_srtp2 clean_opus clean_nginx clean_srs: (cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest) - (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf src include lib utest) + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf include/* lib/*) + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && find src -name "*.o" -delete) + (cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && find utest -name "*.o" -delete) clean_modules: (cd ${SRS_OBJS_DIR} && rm -rf $__mdefaults)