refine configure, move auto headers to script.

winlin
Commit a29b8a7a5b64fda095834b2625d643fd6a7ab250 a29b8a7a 1 parent aaf87cf3
trunk/auto/depends.sh
trunk/auto/libs.sh
trunk/auto/modules.sh
trunk/auto/utest.sh
trunk/configure
--- a/trunk/auto/depends.sh
查看文件 @a29b8a7
+++ b/trunk/auto/depends.sh
查看文件 @a29b8a7
@@ -3,7 +3,6 @@
 # variables, parent script must set it:
 # SRS_JOBS: the build jobs.
 # SrsArmMakeOptions: the arm make options for ubuntu12(armhf, v7cpu)
-# SRS_AUTO_HEADERS_H: the auto generated header file.
 #####################################################################################
 #####################################################################################
@@ -325,30 +324,6 @@ if [ $SRS_HTTP_PARSER = YES ]; then
     if [[ ! -f ${SRS_OBJS}/hp/libhttp_parser.a ]]; then echo "build http-parser-2.1 failed"; exit -1; fi
 fi
-if [ $SRS_HTTP_PARSER = YES ]; then
-    echo "#define SRS_AUTO_HTTP_PARSER" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_HTTP_PARSER" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_HTTP_SERVER = YES ]; then
-    echo "#define SRS_AUTO_HTTP_SERVER" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_HTTP_SERVER" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_STREAM_CASTER = YES ]; then
-    echo "#define SRS_AUTO_STREAM_CASTER" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_STREAM_CASTER" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_HTTP_API = YES ]; then
-    echo "#define SRS_AUTO_HTTP_API" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_HTTP_API" >> $SRS_AUTO_HEADERS_H
-fi
-
 #####################################################################################
 # nginx for HLS, nginx-1.5.0
 #####################################################################################
@@ -420,24 +395,6 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
     echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html
 fi
-if [ $SRS_NGINX = YES ]; then
-    echo "#define SRS_AUTO_NGINX" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_NGINX" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_DVR = YES ]; then
-    echo "#define SRS_AUTO_DVR" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_DVR" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_HLS = YES ]; then
-    echo "#define SRS_AUTO_HLS" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_HLS" >> $SRS_AUTO_HEADERS_H
-fi
-
 #####################################################################################
 # cherrypy for http hooks callback, CherryPy-3.2.4
 #####################################################################################
@@ -458,12 +415,6 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then
     if [ ! -f ${SRS_OBJS}/CherryPy-3.2.4/setup.py ]; then echo "build CherryPy-3.2.4 failed."; exit -1; fi
 fi
-if [ $SRS_HTTP_CALLBACK = YES ]; then
-    echo "#define SRS_AUTO_HTTP_CALLBACK" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_HTTP_CALLBACK" >> $SRS_AUTO_HEADERS_H
-fi
-
 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
     echo "link players to cherrypy static-dir"
     rm -rf research/api-server/static-dir/players &&
@@ -554,12 +505,6 @@ if [ $SRS_SSL = YES ]; then
     fi
 fi
-if [ $SRS_SSL = YES ]; then
-    echo "#define SRS_AUTO_SSL" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_SSL" >> $SRS_AUTO_HEADERS_H
-fi
-
 #####################################################################################
 # live transcoding, ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2.
 #####################################################################################
@@ -580,40 +525,6 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then
     if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-2.1 failed."; exit -1; fi
 fi
-# whether compile ffmpeg tool
-if [ $SRS_FFMPEG_TOOL = YES ]; then
-    echo "#define SRS_AUTO_FFMPEG_TOOL" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_FFMPEG_TOOL" >> $SRS_AUTO_HEADERS_H
-fi
-
-# whatever the FFMPEG tools, if transcode and ingest specified,
-# srs always compile the FFMPEG tool stub which used to start the FFMPEG process.
-if [ $SRS_FFMPEG_STUB = YES ]; then
-    echo "#define SRS_AUTO_FFMPEG_STUB" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_FFMPEG_STUB" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_TRANSCODE = YES ]; then
-    echo "#define SRS_AUTO_TRANSCODE" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_TRANSCODE" >> $SRS_AUTO_HEADERS_H
-fi
-
-if [ $SRS_INGEST = YES ]; then
-    echo "#define SRS_AUTO_INGEST" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_INGEST" >> $SRS_AUTO_HEADERS_H
-fi
-
-# for statistic.
-if [ $SRS_STAT = YES ]; then
-    echo "#define SRS_AUTO_STAT" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_STAT" >> $SRS_AUTO_HEADERS_H
-fi
-
 #####################################################################################
 # build research code, librtmp
 #####################################################################################
@@ -677,88 +588,6 @@ if [ $SRS_GPERF = YES ]; then
     if [ ! -f ${SRS_OBJS}/gperf/bin/pprof ]; then echo "build gperftools-2.1 failed."; exit -1; fi
 fi
-if [ $SRS_GPERF = YES ]; then
-    echo "#define SRS_AUTO_GPERF" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_GPERF" >> $SRS_AUTO_HEADERS_H
-fi
-if [ $SRS_GPERF_MC = YES ]; then
-    echo "#define SRS_AUTO_GPERF_MC" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_GPERF_MC" >> $SRS_AUTO_HEADERS_H
-fi
-if [ $SRS_GPERF_MP = YES ]; then
-    echo "#define SRS_AUTO_GPERF_MP" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_GPERF_MP" >> $SRS_AUTO_HEADERS_H
-fi
-if [ $SRS_GPERF_CP = YES ]; then
-    echo "#define SRS_AUTO_GPERF_CP" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_GPERF_CP" >> $SRS_AUTO_HEADERS_H
-fi
-
-#####################################################################################
-# for embeded.
-#####################################################################################
-if [ $SRS_EMBEDED_CPU = YES ]; then
-    echo "#define SRS_AUTO_EMBEDED_CPU" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_EMBEDED_CPU" >> $SRS_AUTO_HEADERS_H
-fi
-
-# arm
-if [ $SRS_ARM_UBUNTU12 = YES ]; then
-    echo "#define SRS_AUTO_ARM_UBUNTU12" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_ARM_UBUNTU12" >> $SRS_AUTO_HEADERS_H
-fi
-
-# mips
-if [ $SRS_MIPS_UBUNTU12 = YES ]; then
-    echo "#define SRS_AUTO_MIPS_UBUNTU12" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_MIPS_UBUNTU12" >> $SRS_AUTO_HEADERS_H
-fi
-
-echo "" >> $SRS_AUTO_HEADERS_H
-
-# for log level compile settings
-if [ $SRS_LOG_VERBOSE = YES ]; then
-    echo "#define SRS_AUTO_VERBOSE" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_VERBOSE" >> $SRS_AUTO_HEADERS_H
-fi
-if [ $SRS_LOG_INFO = YES ]; then
-    echo "#define SRS_AUTO_INFO" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_INFO" >> $SRS_AUTO_HEADERS_H
-fi
-if [ $SRS_LOG_TRACE = YES ]; then
-    echo "#define SRS_AUTO_TRACE" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#undef SRS_AUTO_TRACE" >> $SRS_AUTO_HEADERS_H
-fi
-
-# prefix
-echo "" >> $SRS_AUTO_HEADERS_H
-echo "#define SRS_AUTO_PREFIX \"${SRS_PREFIX}\"" >> $SRS_AUTO_HEADERS_H
-
-echo "" >> $SRS_AUTO_HEADERS_H
-
-#####################################################################################
-# generated the contributors from AUTHORS.txt
-#####################################################################################
-SRS_CONSTRIBUTORS=`cat ../AUTHORS.txt|grep "*"|awk '{print $2}'`
-echo "#define SRS_AUTO_CONSTRIBUTORS \"\\" >> $SRS_AUTO_HEADERS_H
-for CONTRIBUTOR in $SRS_CONSTRIBUTORS; do
-    echo "${CONTRIBUTOR} \\" >> $SRS_AUTO_HEADERS_H
-done
-echo "\"" >> $SRS_AUTO_HEADERS_H
-
-# new empty line to auto headers file.
-echo "" >> $SRS_AUTO_HEADERS_H
-
 #####################################################################################
 # generated the test script
 #####################################################################################
--- a/trunk/auto/libs.sh
查看文件 @a29b8a7
+++ b/trunk/auto/libs.sh
查看文件 @a29b8a7
@@ -57,7 +57,7 @@ done
 echo "" >> ${FILE}
 # parent Makefile, to create module output dir before compile it.
-echo "	mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
-echo "	mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
+echo "	@mkdir -p ${SRS_OBJS_DIR}/include" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
+echo "	@mkdir -p ${SRS_OBJS_DIR}/lib" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
 echo -n "generate lib ${LIB_NAME} ok"; echo '!';
--- a/trunk/auto/modules.sh
查看文件 @a29b8a7
+++ b/trunk/auto/modules.sh
查看文件 @a29b8a7
@@ -85,6 +85,6 @@ done
 echo "" >> ${FILE}
 # parent Makefile, to create module output dir before compile it.
-echo "	mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
+echo "	@mkdir -p ${SRS_OBJS_DIR}/${MODULE_DIR}" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
 echo -n "generate module ${MODULE_ID} ok"; echo '!';
--- a/trunk/auto/utest.sh
查看文件 @a29b8a7
+++ b/trunk/auto/utest.sh
查看文件 @a29b8a7
@@ -176,6 +176,6 @@ END
 #####################################################################################
 # parent Makefile, to create module output dir before compile it.
-echo "	mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
+echo "	@mkdir -p ${SRS_OBJS_DIR}/utest" >> ${SRS_WORKDIR}/${SRS_MAKEFILE}
 echo -n "generate utest ok"; echo '!';
--- a/trunk/configure
查看文件 @a29b8a7
+++ b/trunk/configure
查看文件 @a29b8a7
@@ -27,73 +27,11 @@ BLACK="\\e[0m"
 # for export srs-librtmp, change target to it.
 . auto/generate-srs-librtmp-project.sh
-# 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 [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
-    if [[ -f Makefile ]]; then
-        make clean
-    fi
-fi
-
-# write user options to headers
-echo "// auto generated by configure" > $SRS_AUTO_HEADERS_H
-echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
-echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
-echo "" >> $SRS_AUTO_HEADERS_H
-
-echo "#define SRS_AUTO_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
-echo "#define SRS_AUTO_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
-echo "#define SRS_AUTO_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H
-echo "#define SRS_AUTO_USER_CONFIGURE \"${SRS_AUTO_USER_CONFIGURE}\"" >> $SRS_AUTO_HEADERS_H
-echo "#define SRS_AUTO_CONFIGURE \"${SRS_AUTO_CONFIGURE}\"" >> $SRS_AUTO_HEADERS_H
-
-# new empty line to auto headers file.
-echo "" >> $SRS_AUTO_HEADERS_H
-
-#####################################################################################
-# generate auto headers file, depends on the finished of options.sh
-#####################################################################################
-if [ $SRS_ARM_UBUNTU12 = YES ]; then
-    __SrsArmCC="arm-linux-gnueabi-gcc";
-    __SrsArmGCC="arm-linux-gnueabi-gcc";
-    __SrsArmCXX="arm-linux-gnueabi-g++";
-    __SrsArmAR="arm-linux-gnueabi-ar";
-    __SrsArmLD="arm-linux-gnueabi-ld";
-    __SrsArmRANDLIB="arm-linux-gnueabi-ranlib";
-fi
-if [ $SRS_MIPS_UBUNTU12 = YES ]; then
-    __SrsArmCC="mipsel-openwrt-linux-gcc";
-    __SrsArmGCC="mipsel-openwrt-linux-gcc";
-    __SrsArmCXX="mipsel-openwrt-linux-g++";
-    __SrsArmAR="mipsel-openwrt-linux-ar";
-    __SrsArmLD="mipsel-openwrt-linux-ld";
-    __SrsArmRANDLIB="mipsel-openwrt-linux-ranlib";
-fi
-# the arm-ubuntu12 options for make for depends
-if [[ -z $SrsArmCC ]]; then SrsArmCC=$__SrsArmCC; fi
-if [[ -z $SrsArmGCC ]]; then SrsArmGCC=$__SrsArmGCC; fi
-if [[ -z $SrsArmCXX ]]; then SrsArmCXX=$__SrsArmCXX; fi
-if [[ -z $SrsArmAR ]]; then SrsArmAR=$__SrsArmAR; fi
-if [[ -z $SrsArmLD ]]; then SrsArmLD=$__SrsArmLD; fi
-if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB=$__SrsArmRANDLIB; fi
-# write to source file
-if [ $SRS_EMBEDED_CPU = YES ]; then
-    echo "cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB"
-    echo "#define SRS_AUTO_EMBEDED_TOOL_CHAIN \"cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB\"" >> $SRS_AUTO_HEADERS_H
-else
-    echo "#define SRS_AUTO_EMBEDED_TOOL_CHAIN \"normal x86/x64 gcc\"" >> $SRS_AUTO_HEADERS_H
-fi
-echo "" >> $SRS_AUTO_HEADERS_H
-
 # apply user options.
 . auto/depends.sh
-# auto header EOF.
-echo "#endif" >> $SRS_AUTO_HEADERS_H
-echo "" >> $SRS_AUTO_HEADERS_H
+# the auto generated variables.
+. auto/auto_headers.sh
 #####################################################################################
 # generate Makefile.