From d4d3d4631725be28e30b22131d4743de4859a458 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 8 Nov 2014 15:31:21 +0800 Subject: [PATCH 1/2] implements export srslibrtmp. for bug #191 --- trunk/auto/apps.sh | 0 trunk/auto/generate_header.sh | 0 trunk/auto/libs.sh | 0 trunk/auto/modules.sh | 0 trunk/auto/options.sh | 29 ++++ trunk/auto/summary.sh | 100 +++++++++++++ trunk/configure | 266 +++++++++++++++------------------- 7 files changed, 243 insertions(+), 152 deletions(-) mode change 100644 => 100755 trunk/auto/apps.sh mode change 100644 => 100755 trunk/auto/generate_header.sh mode change 100644 => 100755 trunk/auto/libs.sh mode change 100644 => 100755 trunk/auto/modules.sh create mode 100755 trunk/auto/summary.sh diff --git a/trunk/auto/apps.sh b/trunk/auto/apps.sh old mode 100644 new mode 100755 diff --git a/trunk/auto/generate_header.sh b/trunk/auto/generate_header.sh old mode 100644 new mode 100755 diff --git a/trunk/auto/libs.sh b/trunk/auto/libs.sh old mode 100644 new mode 100755 diff --git a/trunk/auto/modules.sh b/trunk/auto/modules.sh old mode 100644 new mode 100755 diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 06a802297..cbc667a10 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -58,6 +58,8 @@ SRS_LOG_TRACE=RESERVED # experts # donot compile ssl, use system ssl(-lssl) if required. SRS_USE_SYS_SSL=NO +# export the srs-librtmp to specified path, NO to disable it. +SRS_EXPORT_LIBRTMP=NO # ################################################################ # presets @@ -182,6 +184,7 @@ Conflicts: Experts: --use-sys-ssl donot compile ssl, use system ssl(-lssl) if required. + --export-librtmp= export srs-librtmp to specified path. Workflow: 1. apply "Presets". if not specified, use default preset. @@ -263,6 +266,7 @@ function parse_user_option() { --full) SRS_ENABLE_ALL=YES ;; --use-sys-ssl) SRS_USE_SYS_SSL=YES ;; + --export-librtmp) SRS_EXPORT_LIBRTMP=${value} ;; *) echo "$0: error: invalid option \"$option\"" @@ -696,6 +700,31 @@ function apply_user_detail_options() { else export SRS_JOBS="--jobs=${SRS_JOBS}" fi + + # disable almost all features for export srs-librtmp. + if [ $SRS_EXPORT_LIBRTMP != NO ]; then + SRS_HLS=NO + SRS_DVR=NO + SRS_NGINX=NO + SRS_SSL=NO + SRS_FFMPEG_TOOL=NO + SRS_TRANSCODE=NO + SRS_INGEST=NO + SRS_STAT=NO + SRS_HTTP_PARSER=NO + SRS_HTTP_CALLBACK=NO + SRS_HTTP_SERVER=NO + SRS_HTTP_API=NO + SRS_LIBRTMP=YES + SRS_RESEARCH=YES + SRS_UTEST=NO + SRS_GPERF=NO + SRS_GPERF_MC=NO + SRS_GPERF_MP=NO + SRS_GPERF_CP=NO + SRS_GPROF=NO + SRS_STATIC=NO + fi } apply_user_detail_options diff --git a/trunk/auto/summary.sh b/trunk/auto/summary.sh new file mode 100755 index 000000000..013299f6f --- /dev/null +++ b/trunk/auto/summary.sh @@ -0,0 +1,100 @@ +#!/bin/bash + +# colorful summary +SrsHlsSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HLS = YES ]; then SrsHlsSummaryColor="\${GREEN}"; fi +SrsDvrSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_DVR = YES ]; then SrsDvrSummaryColor="\${GREEN}"; fi +SrsNginxSummaryColor="\${GREEN}{disabled} "; if [ $SRS_NGINX = YES ]; then SrsNginxSummaryColor="\${GREEN}"; fi +SrsSslSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_SSL = YES ]; then SrsSslSummaryColor="\${GREEN}"; fi +SrsFfmpegSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_FFMPEG_TOOL = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi +SrsTranscodeSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_TRANSCODE = YES ]; then SrsTranscodeSummaryColor="\${GREEN}"; fi +SrsIngestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_INGEST = YES ]; then SrsIngestSummaryColor="\${GREEN}"; fi +SrsHttpCallbackSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi +SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi +SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi +SrsLibrtmpSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then SrsLibrtmpSummaryColor="\${GREEN}"; fi +SrsLibrtmpSSLSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then if [ $SRS_SSL = YES ]; then SrsLibrtmpSSLSummaryColor="\${GREEN}"; fi fi +SrsResearchSummaryColor="\${GREEN}{disabled} "; if [ $SRS_RESEARCH = YES ]; then SrsResearchSummaryColor="\${GREEN}"; fi +SrsUtestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_UTEST = YES ]; then SrsUtestSummaryColor="\${GREEN}"; fi +SrsGperfSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF = YES ]; then SrsGperfSummaryColor="\${GREEN}"; fi +SrsGperfMCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MC = YES ]; then SrsGperfMCSummaryColor="\${YELLOW}"; fi +SrsGperfMPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MP = YES ]; then SrsGperfMPSummaryColor="\${YELLOW}"; fi +SrsGperfCPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_CP = YES ]; then SrsGperfCPSummaryColor="\${YELLOW}"; fi +SrsGprofSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPROF = YES ]; then SrsGprofSummaryColor="\${YELLOW}"; fi +cat < ${SRS_OBJS}/${SRS_BUILD_SUMMARY} +#!/bin/bash + +##################################################################################### +# linux shell color support. +RED="\\${RED}" +GREEN="\\${GREEN}" +YELLOW="\\${YELLOW}" +BLACK="\\${BLACK}" + +echo -e "\${GREEN}build summary:\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPERF\${BLACK}" +echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}" +echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check\${BLACK}" +echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf # start gmc\${BLACK}" +echo -e " | ${SrsGperfMCSummaryColor}killall -2 srs # or CTRL+C to stop gmc\${BLACK}" +echo -e " | ${SrsGperfMPSummaryColor}gmp @see: http://google-perftools.googlecode.com/svn/trunk/doc/heapprofile.html\${BLACK}" +echo -e " | ${SrsGperfMPSummaryColor}gmp: gperf memory profile\${BLACK}" +echo -e " | ${SrsGperfMPSummaryColor}rm -f gperf.srs.gmp*; ./objs/srs -c conf/console.conf # start gmp\${BLACK}" +echo -e " | ${SrsGperfMPSummaryColor}killall -2 srs # or CTRL+C to stop gmp\${BLACK}" +echo -e " | ${SrsGperfMPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gmp* # to analysis memory profile\${BLACK}" +echo -e " | ${SrsGperfCPSummaryColor}gcp @see: http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html\${BLACK}" +echo -e " | ${SrsGperfCPSummaryColor}gcp: gperf cpu profile\${BLACK}" +echo -e " | ${SrsGperfCPSummaryColor}rm -f gperf.srs.gcp*; ./objs/srs -c conf/console.conf # start gcp\${BLACK}" +echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}" +echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPROF\${BLACK}" +echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}" +echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}" +echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}" +echo -e " | ${SrsGprofSummaryColor}gprof -b ./objs/srs gmon.out > gprof.srs.log && rm -f gmon.out # gprof report to gprof.srs.log\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info, librtmp.\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp\${BLACK}" +echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}" +echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}" +echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}" +echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp, the srs-librtmp client sample\${BLACK}" +echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_flv\${BLACK}" +echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_rtmp\${BLACK}" +echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_detect_rtmp\${BLACK}" +echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" +echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" +echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}" +echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR\${BLACK}" +echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}" +echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" +echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}" +echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}" +echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMPHandshake\${BLACK}" +echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}" +echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" +echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" +echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}" +echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" +echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" +echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest\${BLACK}" +echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}" +echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback\${BLACK}" +echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" +echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer\${BLACK}" +echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}" +echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi\${BLACK}" +echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}" +echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" +echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build\${BLACK}" + +echo "you can:" +echo " ./objs/srs -c conf/srs.conf" +echo " to start the srs server, with config conf/srs.conf." +END diff --git a/trunk/configure b/trunk/configure index 632e2bf0f..895dfb01c 100755 --- a/trunk/configure +++ b/trunk/configure @@ -4,7 +4,8 @@ # the main output dir, all configure and make output are in this dir. ##################################################################################### # create the main objs -SRS_OBJS="objs" +SRS_WORKDIR="./" +SRS_OBJS="${SRS_WORKDIR}/objs" mkdir -p ${SRS_OBJS} ##################################################################################### @@ -19,14 +20,33 @@ BLACK="\\e[0m" # srs features: SRS_SSL/SRS_HLS/SRS_NGINX/SRS_FFMPEG_TOOL/SRS_HTTP_CALLBACK/...... # build options: SRS_JOBS ##################################################################################### -SRS_AUTO_HEADERS_H="${SRS_OBJS}/srs_auto_headers.hpp" # parse options, exit with error when parse options invalid. . auto/options.sh -# clean the exists +# for export srs-librtmp, change target to it. +if [ $SRS_EXPORT_LIBRTMP != NO ]; then + if [[ -d ${SRS_EXPORT_LIBRTMP} ]]; then + echo -e "${RED}srs-librtmp target dir exists: ${SRS_EXPORT_LIBRTMP}. ${BLACK}" + exit 1 + fi + # create target + SRS_WORKDIR=${SRS_EXPORT_LIBRTMP} && SRS_OBJS=${SRS_WORKDIR}/objs && mkdir -p ${SRS_OBJS} && + # copy src to target + _CPT=${SRS_EXPORT_LIBRTMP}/3rdparty && mkdir -p ${_CPT} && cp 3rdparty/st-1.9.zip ${_CPT} && + _CPT=${SRS_EXPORT_LIBRTMP}/3rdparty/patches && mkdir -p ${_CPT} && cp 3rdparty/patches/1.st.arm.patch ${_CPT} && + # check ret + ret=$?; if [[ $ret -ne 0 ]]; then echo "export src failed, ret=$ret"; exit $ret; fi +fi + +# the auto generated variables. +SRS_AUTO_HEADERS_H="${SRS_OBJS}/srs_auto_headers.hpp" + +# clean the exists, when not export srs-librtmp. # do this only when the options is ok. -if [[ -f Makefile ]]; then - make clean +if [ $SRS_EXPORT_LIBRTMP = NO ]; then + if [[ -f Makefile ]]; then + make clean + fi fi # write user options to headers @@ -102,109 +122,13 @@ SrsUtestMakeEntry="@echo -e \"ignore utest for it's disabled\"" if [ $SRS_UTEST = YES ]; then SrsUtestMakeEntry="(cd ${SRS_OBJS}/utest; \$(MAKE))"; fi ##################################################################################### -# colorful summary -SrsHlsSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HLS = YES ]; then SrsHlsSummaryColor="\${GREEN}"; fi -SrsDvrSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_DVR = YES ]; then SrsDvrSummaryColor="\${GREEN}"; fi -SrsNginxSummaryColor="\${GREEN}{disabled} "; if [ $SRS_NGINX = YES ]; then SrsNginxSummaryColor="\${GREEN}"; fi -SrsSslSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_SSL = YES ]; then SrsSslSummaryColor="\${GREEN}"; fi -SrsFfmpegSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_FFMPEG_TOOL = YES ]; then SrsFfmpegSummaryColor="\${GREEN}"; fi -SrsTranscodeSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_TRANSCODE = YES ]; then SrsTranscodeSummaryColor="\${GREEN}"; fi -SrsIngestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_INGEST = YES ]; then SrsIngestSummaryColor="\${GREEN}"; fi -SrsHttpCallbackSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_CALLBACK = YES ]; then SrsHttpCallbackSummaryColor="\${GREEN}"; fi -SrsHttpServerSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_SERVER = YES ]; then SrsHttpServerSummaryColor="\${GREEN}"; fi -SrsHttpApiSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_HTTP_API = YES ]; then SrsHttpApiSummaryColor="\${GREEN}"; fi -SrsLibrtmpSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then SrsLibrtmpSummaryColor="\${GREEN}"; fi -SrsLibrtmpSSLSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_LIBRTMP = YES ]; then if [ $SRS_SSL = YES ]; then SrsLibrtmpSSLSummaryColor="\${GREEN}"; fi fi -SrsResearchSummaryColor="\${GREEN}{disabled} "; if [ $SRS_RESEARCH = YES ]; then SrsResearchSummaryColor="\${GREEN}"; fi -SrsUtestSummaryColor="\${YELLOW}{disabled} "; if [ $SRS_UTEST = YES ]; then SrsUtestSummaryColor="\${GREEN}"; fi -SrsGperfSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF = YES ]; then SrsGperfSummaryColor="\${GREEN}"; fi -SrsGperfMCSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MC = YES ]; then SrsGperfMCSummaryColor="\${YELLOW}"; fi -SrsGperfMPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_MP = YES ]; then SrsGperfMPSummaryColor="\${YELLOW}"; fi -SrsGperfCPSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPERF_CP = YES ]; then SrsGperfCPSummaryColor="\${YELLOW}"; fi -SrsGprofSummaryColor="\${GREEN}{disabled} "; if [ $SRS_GPROF = YES ]; then SrsGprofSummaryColor="\${YELLOW}"; fi -cat < ${SRS_OBJS}/${SRS_BUILD_SUMMARY} -#!/bin/bash - -##################################################################################### -# linux shell color support. -RED="\\${RED}" -GREEN="\\${GREEN}" -YELLOW="\\${YELLOW}" -BLACK="\\${BLACK}" - -echo -e "\${GREEN}build summary:\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPERF\${BLACK}" -echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}" -echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check\${BLACK}" -echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf # start gmc\${BLACK}" -echo -e " | ${SrsGperfMCSummaryColor}killall -2 srs # or CTRL+C to stop gmc\${BLACK}" -echo -e " | ${SrsGperfMPSummaryColor}gmp @see: http://google-perftools.googlecode.com/svn/trunk/doc/heapprofile.html\${BLACK}" -echo -e " | ${SrsGperfMPSummaryColor}gmp: gperf memory profile\${BLACK}" -echo -e " | ${SrsGperfMPSummaryColor}rm -f gperf.srs.gmp*; ./objs/srs -c conf/console.conf # start gmp\${BLACK}" -echo -e " | ${SrsGperfMPSummaryColor}killall -2 srs # or CTRL+C to stop gmp\${BLACK}" -echo -e " | ${SrsGperfMPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gmp* # to analysis memory profile\${BLACK}" -echo -e " | ${SrsGperfCPSummaryColor}gcp @see: http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html\${BLACK}" -echo -e " | ${SrsGperfCPSummaryColor}gcp: gperf cpu profile\${BLACK}" -echo -e " | ${SrsGperfCPSummaryColor}rm -f gperf.srs.gcp*; ./objs/srs -c conf/console.conf # start gcp\${BLACK}" -echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}" -echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_GPROF\${BLACK}" -echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}" -echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}" -echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}" -echo -e " | ${SrsGprofSummaryColor}gprof -b ./objs/srs gmon.out > gprof.srs.log && rm -f gmon.out # gprof report to gprof.srs.log\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info, librtmp.\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLibrtmp\${BLACK}" -echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}" -echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}" -echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}" -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp, the srs-librtmp client sample\${BLACK}" -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_flv\${BLACK}" -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_ingest_rtmp\${BLACK}" -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_detect_rtmp\${BLACK}" -echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" -echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" -echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}" -echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DVR\${BLACK}" -echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}" -echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_DeliveryHLS\${BLACK}" -echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}" -echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}" -echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_RTMPHandshake\${BLACK}" -echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}" -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" -echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}" -echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_FFMPEG\${BLACK}" -echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" -echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Ingest\${BLACK}" -echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}" -echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPCallback\${BLACK}" -echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" -echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPServer\${BLACK}" -echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}" -echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_HTTPApi\${BLACK}" -echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}" -echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" -echo -e "\${GREEN}binaries @see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Build\${BLACK}" - -echo "you can:" -echo " ./objs/srs -c conf/srs.conf" -echo " to start the srs server, with config conf/srs.conf." -END +# generate colorful summary script +. auto/summary.sh ##################################################################################### # makefile echo "generate Makefile" -cat << END > ${SRS_MAKEFILE} +cat << END > ${SRS_WORKDIR}/${SRS_MAKEFILE} .PHONY: default _default install install-api help clean server librtmp utest _prepare_dir # install prefix. @@ -215,22 +139,24 @@ END # embeded, ubuntu12, use embeded tool chain. if [ $SRS_EMBEDED_CPU = YES ]; then - cat << END >> ${SRS_MAKEFILE} + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} default: \$(MAKE) GCC=${SrsArmGCC} CXX=${SrsArmCXX} AR=${SrsArmAR} LINK=${SrsArmCXX} _default END # x86/x64, use gnu-gcc/g++ tool chain. else - cat << END >> ${SRS_MAKEFILE} + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} default: \$(MAKE) _default END fi -# the real entry for all platform. -cat << END >> ${SRS_MAKEFILE} +# the real entry for all platform: +# the server, librtmp and utest +# where the bellow will check and disable some entry by only echo. +cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} _default: server librtmp utest @bash objs/_srs_build_summary.sh @@ -252,14 +178,39 @@ clean: (cd research/librtmp; make clean) (cd research/api-server/static-dir; rm -rf crossdomain.xml forward live players) +END + +# if export librtmp, donot build the srs server. +if [ $SRS_EXPORT_LIBRTMP != NO ]; then + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} +server: _prepare_dir + @echo "donot build the srs(simple rtmp server) for srs-librtmp" + +END +else + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} server: _prepare_dir @echo "build the srs(simple rtmp server) over st(state-threads)" \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} srs END +fi + +# disable install entry for srs-librtmp +if [ $SRS_EXPORT_LIBRTMP != NO ]; then + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} +uninstall: + @echo "disable uninstall for srs-librtmp" + +install-api: + @echo "disable install-api for srs-librtmp" -# install entry -cat << END >> ${SRS_MAKEFILE} +install: + @echo "disable install for srs-librtmp" + +END +else + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} uninstall: @echo "rmdir \$(SRS_PREFIX)" @rm -rf \$(SRS_PREFIX) @@ -311,9 +262,11 @@ install: @echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_LinuxService" END +fi +# generate srs-librtmp entry if [ $SRS_LIBRTMP = YES ]; then - cat << END >> ${SRS_MAKEFILE} + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} librtmp: server @echo "build the client publish/play library." \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} librtmp @@ -322,7 +275,7 @@ librtmp: server END else - cat << END >> ${SRS_MAKEFILE} + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} librtmp: server @echo "srs-librtmp is disabled, ignore." @@ -330,7 +283,7 @@ END fi if [ $SRS_UTEST = YES ]; then - cat << END >> ${SRS_MAKEFILE} + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} utest: server @echo "build the utest for srs" ${SrsUtestMakeEntry} @@ -338,14 +291,14 @@ utest: server END else - cat << END >> ${SRS_MAKEFILE} + cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} utest: server @echo "utest is disabled, ignore" END fi -cat << END >> ${SRS_MAKEFILE} +cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} # the ./configure will generate it. _prepare_dir: @mkdir -p ${SRS_OBJS} @@ -437,17 +390,19 @@ RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh RTMP_OBJS="${MODULE_OBJS[@]}" # #App Module -MODULE_ID="APP" -MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") -ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) -MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" - "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" - "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" - "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" - "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge" - "srs_app_kbps" "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_avc_aac") -APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh -APP_OBJS="${MODULE_OBJS[@]}" +if [ $SRS_EXPORT_LIBRTMP = NO ]; then + MODULE_ID="APP" + MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") + ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) + MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" + "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" + "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" + "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" + "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge" + "srs_app_kbps" "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_avc_aac") + APP_INCS="src/app"; MODULE_DIR=${APP_INCS} . auto/modules.sh + APP_OBJS="${MODULE_OBJS[@]}" +fi # #LIBS Module, build libsrs.a for static link. MODULE_ID="LIBS" @@ -458,29 +413,34 @@ LIBS_INCS="src/libs"; MODULE_DIR=${LIBS_INCS} . auto/modules.sh LIBS_OBJS="${MODULE_OBJS[@]}" # #Main Module -MODULE_ID="MAIN" -MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") -ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS} ${LibGperfRoot}) -MODULE_FILES=("srs_main_server") -MAIN_INCS="src/main"; MODULE_DIR=${MAIN_INCS} . auto/modules.sh -MAIN_OBJS="${MODULE_OBJS[@]}" +if [ $SRS_EXPORT_LIBRTMP = NO ]; then + MODULE_ID="MAIN" + MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") + ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS} ${LibGperfRoot}) + MODULE_FILES=("srs_main_server") + MAIN_INCS="src/main"; MODULE_DIR=${MAIN_INCS} . auto/modules.sh + MAIN_OBJS="${MODULE_OBJS[@]}" +fi ##################################################################################### # Binaries, main entrances, link the module and its depends modules, # then link to a binary, for example, objs/srs # -# all main entrances -MAIN_ENTRANCES=("srs_main_server") -# -# all depends libraries -ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile} ${LibGperfFile}) -# all depends objects -MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" -LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}" -# -# srs: -# srs(simple rtmp server) over st(state-threads) -BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" . auto/apps.sh +# disable all app when export librtmp +if [ $SRS_EXPORT_LIBRTMP = NO ]; then + # all main entrances + MAIN_ENTRANCES=("srs_main_server") + # + # all depends libraries + ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile} ${LibGperfFile}) + # all depends objects + MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}" + LINK_OPTIONS="${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}" + # + # srs: + # srs(simple rtmp server) over st(state-threads) + BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" . auto/apps.sh +fi # srs librtmp if [ $SRS_LIBRTMP = YES ]; then MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${LIBS_OBJS[@]}" @@ -488,14 +448,16 @@ if [ $SRS_LIBRTMP = YES ]; then fi # # utest, the unit-test cases of srs, base on gtest1.6 -MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" - "srs_utest_kernel" "srs_utest_core" "srs_utest_config" - "srs_utest_reload") -ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot} ${LibSSLRoot}) -ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) -MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") -MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" -LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh +if [ $SRS_UTEST = YES ]; then + MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" + "srs_utest_kernel" "srs_utest_core" "srs_utest_config" + "srs_utest_reload") + ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot} ${LibSSLRoot}) + ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) + MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") + MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" + LINK_OPTIONS="-lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . auto/utest.sh +fi echo 'configure ok! ' From eb88ebfb39b5cc7a037a024ffaa4c873ccf02003 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 8 Nov 2014 16:07:31 +0800 Subject: [PATCH 2/2] use relative objs dir for makefile. for bug #191 --- trunk/auto/apps.sh | 9 +++++---- trunk/auto/depends.sh | 16 ++++++++------- trunk/auto/libs.sh | 15 ++++++++------- trunk/auto/modules.sh | 7 ++++--- trunk/auto/utest.sh | 15 ++++++++------- trunk/configure | 45 +++++++++++++++++++++++-------------------- 6 files changed, 58 insertions(+), 49 deletions(-) diff --git a/trunk/auto/apps.sh b/trunk/auto/apps.sh index e6fd7d1a6..6b9fbf88f 100755 --- a/trunk/auto/apps.sh +++ b/trunk/auto/apps.sh @@ -1,7 +1,8 @@ # generate the binary # # params: -# $SRS_OBJS the objs directory. ie. objs +# $SRS_OBJS the objs directory to store the Makefile. ie. ./objs +# $SRS_OBJS_DIR the objs directory for Makefile. ie. objs # $SRS_MAKEFILE the makefile name. ie. Makefile # # $MAIN_ENTRANCES array, disable all except the $APP_MAIN itself. ie. ["srs_main_server" "srs_main_bandcheck"] @@ -14,7 +15,7 @@ FILE=${SRS_OBJS}/${SRS_MAKEFILE} -APP_TARGET="${SRS_OBJS}/${APP_NAME}" +APP_TARGET="${SRS_OBJS_DIR}/${APP_NAME}" echo "generate app ${APP_NAME} depends..."; @@ -45,7 +46,7 @@ for item in ${MODULE_OBJS[*]}; do continue; fi - OBJ_FILE=${SRS_OBJS}/$item + OBJ_FILE=${SRS_OBJS_DIR}/$item OBJ_FILE="${OBJ_FILE%.*}.o" echo -n "${OBJ_FILE} " >> ${FILE} done @@ -76,7 +77,7 @@ for item in ${MODULE_OBJS[*]}; do continue; fi - OBJ_FILE=${SRS_OBJS}/$item + OBJ_FILE=${SRS_OBJS_DIR}/$item OBJ_FILE="${OBJ_FILE%.*}.o" echo -n "${OBJ_FILE} " >> ${FILE} done diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 42e3d186c..89b4af760 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -582,21 +582,23 @@ fi ##################################################################################### # build research code, librtmp ##################################################################################### -if [ $SRS_RESEARCH = YES ]; then - mkdir -p ${SRS_OBJS}/research +if [ $SRS_EXPORT_LIBRTMP = NO ]; then + if [ $SRS_RESEARCH = YES ]; then + mkdir -p ${SRS_OBJS}/research - (cd research/hls && make ${SRS_JOBS} && mv ts_info ../../${SRS_OBJS}/research) - ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi + (cd ${SRS_WORKDIR}/research/hls && make ${SRS_JOBS} && mv ts_info ../../${SRS_OBJS_DIR}/research) + ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/hls failed, ret=$ret"; exit $ret; fi - (cd research/ffempty && make ${SRS_JOBS} && mv ffempty ../../${SRS_OBJS}/research) - ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi + (cd research/ffempty && make ${SRS_JOBS} && mv ffempty ../../${SRS_OBJS_DIR}/research) + ret=$?; if [[ $ret -ne 0 ]]; then echo "build research/ffempty failed, ret=$ret"; exit $ret; fi + fi fi if [ $SRS_LIBRTMP = YES ]; then mkdir -p ${SRS_OBJS}/research # librtmp - (cd research/librtmp && mkdir -p objs && ln -sf `pwd`/objs ../../${SRS_OBJS}/research/librtmp) + (cd ${SRS_WORKDIR}/research/librtmp && mkdir -p objs && ln -sf `pwd`/objs ../../${SRS_OBJS_DIR}/research/librtmp) ret=$?; if [[ $ret -ne 0 ]]; then echo "link research/librtmp failed, ret=$ret"; exit $ret; fi fi diff --git a/trunk/auto/libs.sh b/trunk/auto/libs.sh index fcfeabc4b..9f0597173 100755 --- a/trunk/auto/libs.sh +++ b/trunk/auto/libs.sh @@ -1,7 +1,8 @@ # generate the library for static link. # # params: -# $SRS_OBJS the objs directory. ie. objs +# $SRS_OBJS the objs directory to store the Makefile. ie. ./objs +# $SRS_OBJS_DIR the objs directory for Makefile. ie. objs # $SRS_MAKEFILE the makefile name. ie. Makefile # # $BUILD_KEY a string indicates the build key for Makefile. ie. dump @@ -10,7 +11,7 @@ FILE=${SRS_OBJS}/${SRS_MAKEFILE} -LIB_TARGET="${SRS_OBJS}/${LIB_NAME}" +LIB_TARGET="${SRS_OBJS_DIR}/${LIB_NAME}" LIB_TAGET_STATIC="${LIB_TARGET}.a" echo "generate lib ${LIB_NAME} depends..." @@ -29,14 +30,14 @@ for item in ${MODULE_OBJS[*]}; do continue; fi - OBJ_FILE=${SRS_OBJS}/$item + OBJ_FILE=${SRS_OBJS_DIR}/$item OBJ_FILE="${OBJ_FILE%.*}.o" echo -n "${OBJ_FILE} " >> ${FILE} done echo "" >> ${FILE} # build header file -echo -n " @bash auto/generate_header.sh ${SRS_OBJS}" >> ${FILE} +echo -n " @bash auto/generate_header.sh ${SRS_OBJS_DIR}" >> ${FILE} echo "" >> ${FILE} # archive librtmp.a @@ -49,14 +50,14 @@ for item in ${MODULE_OBJS[*]}; do continue; fi - OBJ_FILE=${SRS_OBJS}/$item + OBJ_FILE=${SRS_OBJS_DIR}/$item OBJ_FILE="${OBJ_FILE%.*}.o" echo -n "${OBJ_FILE} " >> ${FILE} done echo "" >> ${FILE} # parent Makefile, to create module output dir before compile it. -echo " mkdir -p ${SRS_OBJS}/include" >> ${SRS_MAKEFILE} -echo " mkdir -p ${SRS_OBJS}/lib" >> ${SRS_MAKEFILE} +echo " mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_MAKEFILE} +echo " mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_MAKEFILE} echo -n "generate lib ${LIB_NAME} ok"; echo '!'; diff --git a/trunk/auto/modules.sh b/trunk/auto/modules.sh index 8c9a59c56..d33114184 100755 --- a/trunk/auto/modules.sh +++ b/trunk/auto/modules.sh @@ -1,7 +1,8 @@ # generate the module info to Makefile # # params: -# $SRS_OBJS the objs directory. ie. objs +# $SRS_OBJS the objs directory to store the Makefile. ie. ./objs +# $SRS_OBJS_DIR the objs directory for Makefile. ie. objs # $SRS_MAKEFILE the makefile name. ie. Makefile # # $MODULE_DIR the module dir. ie. src/os/linux @@ -73,7 +74,7 @@ echo "# OBJ for ${MODULE_ID}, each object file" >> ${FILE} MODULE_OBJS=() for item in ${MODULE_FILES[*]}; do CPP_FILE="${MODULE_DIR}/${item}.cpp" - OBJ_FILE="${SRS_OBJS}/${MODULE_DIR}/${item}.o" + OBJ_FILE="${SRS_OBJS_DIR}/${MODULE_DIR}/${item}.o" MODULE_OBJS="${MODULE_OBJS[@]} ${CPP_FILE}" if [ -f ${CPP_FILE} ]; then echo "${OBJ_FILE}: \$(${DEPS_NAME}) ${CPP_FILE} " >> ${FILE} @@ -84,6 +85,6 @@ done echo "" >> ${FILE} # parent Makefile, to create module output dir before compile it. -echo " mkdir -p ${SRS_OBJS}/${MODULE_DIR}" >> ${SRS_MAKEFILE} +echo " mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_MAKEFILE} echo -n "generate module ${MODULE_ID} ok"; echo '!'; diff --git a/trunk/auto/utest.sh b/trunk/auto/utest.sh index 45b4a15bc..cff082af6 100755 --- a/trunk/auto/utest.sh +++ b/trunk/auto/utest.sh @@ -1,7 +1,8 @@ # generate utest Makefile # # params: -# $SRS_OBJS the objs directory. ie. objs +# $SRS_OBJS the objs directory to store the Makefile. ie. ./objs +# $SRS_OBJS_DIR the objs directory for Makefile. ie. objs # $SRS_MAKEFILE the makefile name. ie. Makefile # # $APP_NAME the app name to output. ie. srs_utest @@ -17,10 +18,10 @@ mkdir -p ${SRS_OBJS}/utest # trunk of srs, which contains the src dir, relative to objs/utest, it's trunk SRS_TRUNK_PREFIX=../.. # gest dir, relative to objs/utest, it's trunk/objs/gtest -GTEST_DIR=${SRS_TRUNK_PREFIX}/${SRS_OBJS}/gtest +GTEST_DIR=${SRS_TRUNK_PREFIX}/${SRS_OBJS_DIR}/gtest cat << END > ${FILE} -# user must run make the ${SRS_OBJS}/utest dir +# user must run make the ${SRS_OBJS_DIR}/utest dir # at the same dir of Makefile. # A sample Makefile for building Google Test and using it in user @@ -52,7 +53,7 @@ CXXFLAGS += -g -Wall -Wextra -O0 # All tests produced by this Makefile. Remember to add new tests you # created to the list. -TESTS = ${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${APP_NAME} +TESTS = ${SRS_TRUNK_PREFIX}/${SRS_OBJS_DIR}/${APP_NAME} # All Google Test headers. Usually you shouldn't change this # definition. @@ -129,7 +130,7 @@ echo "# Depends, the depends objects" >> ${FILE} echo -n "SRS_UTEST_DEPS = " >> ${FILE} for item in ${MODULE_OBJS[*]}; do FILE_NAME=${item%.*} - echo -n "${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${FILE_NAME}.o " >> ${FILE} + echo -n "${SRS_TRUNK_PREFIX}/${SRS_OBJS_DIR}/${FILE_NAME}.o " >> ${FILE} done echo "" >> ${FILE}; echo "" >> ${FILE} # @@ -169,12 +170,12 @@ echo "" >> ${FILE}; echo "" >> ${FILE} # echo "# generate the utest binary" >> ${FILE} cat << END >> ${FILE} -${SRS_TRUNK_PREFIX}/${SRS_OBJS}/${APP_NAME} : \$(SRS_UTEST_DEPS) ${MODULE_OBJS} gtest_main.a +${SRS_TRUNK_PREFIX}/${SRS_OBJS_DIR}/${APP_NAME} : \$(SRS_UTEST_DEPS) ${MODULE_OBJS} gtest_main.a \$(CXX) -o \$@ \$(CPPFLAGS) \$(CXXFLAGS) \$^ \$(DEPS_LIBRARIES_FILES) ${LINK_OPTIONS} END ##################################################################################### # parent Makefile, to create module output dir before compile it. -echo " mkdir -p ${SRS_OBJS}/utest" >> ${SRS_MAKEFILE} +echo " mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_MAKEFILE} echo -n "generate utest ok"; echo '!'; diff --git a/trunk/configure b/trunk/configure index 895dfb01c..3f33c9e48 100755 --- a/trunk/configure +++ b/trunk/configure @@ -4,8 +4,9 @@ # the main output dir, all configure and make output are in this dir. ##################################################################################### # create the main objs -SRS_WORKDIR="./" -SRS_OBJS="${SRS_WORKDIR}/objs" +SRS_WORKDIR="." +SRS_OBJS_DIR="objs" +SRS_OBJS="${SRS_WORKDIR}/${SRS_OBJS_DIR}" mkdir -p ${SRS_OBJS} ##################################################################################### @@ -30,10 +31,12 @@ if [ $SRS_EXPORT_LIBRTMP != NO ]; then exit 1 fi # create target - SRS_WORKDIR=${SRS_EXPORT_LIBRTMP} && SRS_OBJS=${SRS_WORKDIR}/objs && mkdir -p ${SRS_OBJS} && + SRS_WORKDIR=${SRS_EXPORT_LIBRTMP} && SRS_OBJS=${SRS_WORKDIR}/${SRS_OBJS_DIR} && mkdir -p ${SRS_OBJS} && # copy src to target _CPT=${SRS_EXPORT_LIBRTMP}/3rdparty && mkdir -p ${_CPT} && cp 3rdparty/st-1.9.zip ${_CPT} && _CPT=${SRS_EXPORT_LIBRTMP}/3rdparty/patches && mkdir -p ${_CPT} && cp 3rdparty/patches/1.st.arm.patch ${_CPT} && + _CPT=${SRS_EXPORT_LIBRTMP}/research/librtmp && mkdir -p ${_CPT} && cp research/librtmp/*.c ${_CPT} && cp research/librtmp/Makefile ${_CPT} && + _CPT=${SRS_EXPORT_LIBRTMP}/src/core && mkdir -p ${_CPT} && cp src/core/* ${_CPT} # check ret ret=$?; if [[ $ret -ne 0 ]]; then echo "export src failed, ret=$ret"; exit $ret; fi fi @@ -119,7 +122,7 @@ SrsLibrtmpSampleEntry="nossl" if [ $SRS_SSL = YES ]; then SrsLibrtmpSampleEntry="ssl";fi # utest make entry, (cd utest; make) SrsUtestMakeEntry="@echo -e \"ignore utest for it's disabled\"" -if [ $SRS_UTEST = YES ]; then SrsUtestMakeEntry="(cd ${SRS_OBJS}/utest; \$(MAKE))"; fi +if [ $SRS_UTEST = YES ]; then SrsUtestMakeEntry="(cd ${SRS_OBJS_DIR}/utest; \$(MAKE))"; fi ##################################################################################### # generate colorful summary script @@ -172,9 +175,9 @@ help: @echo " uninstall uninstall srs from prefix path" clean: - (cd ${SRS_OBJS}; rm -rf srs srs_utest) - (cd ${SRS_OBJS}; rm -rf src research include lib) - (cd ${SRS_OBJS}/utest; rm -rf *.o *.a) + (cd ${SRS_OBJS_DIR}; rm -rf srs srs_utest) + (cd ${SRS_OBJS_DIR}; rm -rf src research include lib) + (cd ${SRS_OBJS_DIR}/utest; rm -rf *.o *.a) (cd research/librtmp; make clean) (cd research/api-server/static-dir; rm -rf crossdomain.xml forward live players) @@ -191,7 +194,7 @@ else cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} server: _prepare_dir @echo "build the srs(simple rtmp server) over st(state-threads)" - \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} srs + \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} srs END fi @@ -269,7 +272,7 @@ if [ $SRS_LIBRTMP = YES ]; then cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} librtmp: server @echo "build the client publish/play library." - \$(MAKE) -f ${SRS_OBJS}/${SRS_MAKEFILE} librtmp + \$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} librtmp @echo "build the srs-librtmp sample" (cd research/librtmp; \$(MAKE) ${SrsLibrtmpSampleEntry}) @@ -301,7 +304,7 @@ fi cat << END >> ${SRS_WORKDIR}/${SRS_MAKEFILE} # the ./configure will generate it. _prepare_dir: - @mkdir -p ${SRS_OBJS} + @mkdir -p ${SRS_OBJS_DIR} END ##################################################################################### @@ -340,16 +343,16 @@ END # library(.a): add to ModuleLibFiles if binary need the specifeid library. for example, LibSTfile # # st(state-threads) the basic network library for SRS. -LibSTRoot="${SRS_OBJS}/st"; LibSTfile="${LibSTRoot}/libst.a" +LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a" # hp(http-parser) the http request/url parser, for SRS to support HTTP callback. LibHttpParserRoot=""; LibHttpParserfile="" -if [ $SRS_HTTP_PARSER = YES ]; then LibHttpParserRoot="${SRS_OBJS}/hp"; LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"; fi +if [ $SRS_HTTP_PARSER = YES ]; then LibHttpParserRoot="${SRS_OBJS_DIR}/hp"; LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"; fi # openssl-1.0.1f, for the RTMP complex handshake. LibSSLRoot="";LibSSLfile="" -if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = NO ]; then LibSSLRoot="${SRS_OBJS}/openssl/include"; LibSSLfile="${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"; fi fi +if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = NO ]; then LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a"; fi fi # gperftools-2.1, for mem check and mem/cpu profile LibGperfRoot=""; LibGperfFile="" -if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS}/gperf/include"; LibGperfFile="${SRS_OBJS}/gperf/lib/libtcmalloc_and_profiler.a"; fi +if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS_DIR}/gperf/include"; LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_and_profiler.a"; fi # the link options, always use static link SrsLinkOptions="-ldl"; if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lssl"; fi fi @@ -365,7 +368,7 @@ if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh #Core, depends only on system apis. MODULE_ID="CORE" MODULE_DEPENDS=() -ModuleLibIncs=(${SRS_OBJS}) +ModuleLibIncs=(${SRS_OBJS_DIR}) MODULE_FILES=("srs_core" "srs_core_autofree") CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . auto/modules.sh CORE_OBJS="${MODULE_OBJS[@]}" @@ -373,7 +376,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" #Kernel, depends on core, provides error/log/config, nothing about stream information. MODULE_ID="KERNEL" MODULE_DEPENDS=("CORE") -ModuleLibIncs=(${SRS_OBJS}) +ModuleLibIncs=(${SRS_OBJS_DIR}) MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" "srs_kernel_buffer" "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" "srs_kernel_consts") @@ -383,7 +386,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}" #RTMP Protocol, depends on core/kernel, provides rtmp/htttp protocol features. MODULE_ID="RTMP" MODULE_DEPENDS=("CORE" "KERNEL") -ModuleLibIncs=(${SRS_OBJS} ${LibSSLRoot}) +ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp" "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array") RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh @@ -393,7 +396,7 @@ RTMP_OBJS="${MODULE_OBJS[@]}" if [ $SRS_EXPORT_LIBRTMP = NO ]; then MODULE_ID="APP" MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") - ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) + ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS_DIR}) MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" @@ -407,7 +410,7 @@ fi #LIBS Module, build libsrs.a for static link. MODULE_ID="LIBS" MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") -ModuleLibIncs=(${SRS_OBJS}) +ModuleLibIncs=(${SRS_OBJS_DIR}) MODULE_FILES=("srs_librtmp" "srs_lib_simple_socket" "srs_lib_bandwidth") LIBS_INCS="src/libs"; MODULE_DIR=${LIBS_INCS} . auto/modules.sh LIBS_OBJS="${MODULE_OBJS[@]}" @@ -416,7 +419,7 @@ LIBS_OBJS="${MODULE_OBJS[@]}" if [ $SRS_EXPORT_LIBRTMP = NO ]; then MODULE_ID="MAIN" MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") - ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS} ${LibGperfRoot}) + ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS_DIR} ${LibGperfRoot}) MODULE_FILES=("srs_main_server") MAIN_INCS="src/main"; MODULE_DIR=${MAIN_INCS} . auto/modules.sh MAIN_OBJS="${MODULE_OBJS[@]}" @@ -452,7 +455,7 @@ if [ $SRS_UTEST = YES ]; then MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" "srs_utest_kernel" "srs_utest_core" "srs_utest_config" "srs_utest_reload") - ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot} ${LibSSLRoot}) + ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot}) ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}"