refine build script, add comments for app.sh. change version to 0.9.3

trunk/auto/apps.sh

@@ -1,16 +1,16 @@
-#!/bin/bash
+# generate the binary
-
+#
 # params:
 #     $SRS_OBJS the objs directory. ie. objs
 #     $SRS_MAKEFILE the makefile name. ie. Makefile
-# $MAIN_ENTRANCES array, all main entrance, disable all except the $APP_MAIN itself
+#
+#     $MAIN_ENTRANCES array, disable all except the $APP_MAIN itself. ie. ["srs_main_server" "srs_main_bandcheck"]
+#     $APP_MAIN the object file that contains main function. ie. srs_main_server
+#     $BUILD_KEY a string indicates the build key for Makefile. ie. srs
+#     $APP_NAME the app name to output. ie. srs
 #     $MODULE_OBJS array, the objects to compile the app.
-# $BUILD_KEY a string indicates the build key for Makefile. ie. dump
+#     $ModuleLibFiles array, the 3rdpart library file to link with. ie. [objs/st-1.9/obj/libst.a objs/libx264/obj/libx264.a]
-# $APP_MAIN the object file that contains main function. ie. your_app_main
+#     $LINK_OPTIONS the linker options. ie. -ldl
-# $APP_NAME the app name to output. ie. your_app
-# $ModuleLibFiles array, the 3rdpart library file to link with. ie. (objs/st-1.9/obj/libst.a objs/libx264/obj/libx264.a)
-# $LINK_OPTIONS the linker options.
-# $SO_PATH the libssl.so.10 and other so file path.
 
 FILE=${SRS_OBJS}/${SRS_MAKEFILE}
 
@@ -19,8 +19,11 @@ APP_TARGET="${SRS_OBJS}/${APP_NAME}"
 echo "generate app ${APP_NAME} depends...";
 
 echo "# build ${APP_TARGET}" >> ${FILE}
+# generate the binary depends, for example:
+#       srs: objs/srs
 echo "${BUILD_KEY}: ${APP_TARGET}" >> ${FILE}
-
+# the link commands, for example:
+#       objs/srs: objs/src/core/srs_core.o
 echo -n "${APP_TARGET}: " >> ${FILE}
 for item in ${MODULE_OBJS[*]}; do
     FILE_NAME=`basename $item`
@@ -50,7 +53,9 @@ echo "" >> ${FILE}
 
 echo "generate app ${APP_NAME} link...";
 
-echo -n "	\$(LINK) ${PerformanceLink} -o ${APP_TARGET} " >> ${FILE}
+# genereate the actual link command, for example:
+#       	$(LINK)  -o objs/srs objs/src/core/srs_core.o -ldl
+echo -n "	\$(LINK) -o ${APP_TARGET} " >> ${FILE}
 for item in ${MODULE_OBJS[*]}; do
     FILE_NAME=`basename $item`
     FILE_NAME=${FILE_NAME%.*}
@@ -83,10 +88,4 @@ done
 echo -n "${LINK_OPTIONS}" >> ${FILE}
 echo "" >> ${FILE}
 
-# set the so reference path.
-if [[ ! -z ${SO_PATH} ]]; then
-    echo -n "	@bash auto/set_so_rpath.sh ${SOPathTool} ${APP_TARGET} ${SO_PATH}" >> ${FILE}
-    echo "" >> ${FILE}
-fi
-
 echo -n "generate app ${APP_NAME} ok"; echo '!';

trunk/configure

@@ -157,9 +157,9 @@ ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
 MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}"
 LINK_OPTIONS="-ldl"
 # srs(simple rtmp server) over st(state-threads)
-BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" SO_PATH="" . auto/apps.sh
+BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" . auto/apps.sh
 # bandwidth test tool, to test the bandwidth to server
-BUILD_KEY="bandwidth" APP_MAIN="srs_main_bandcheck" APP_NAME="bandwidth" SO_PATH="" . auto/apps.sh
+BUILD_KEY="bandwidth" APP_MAIN="srs_main_bandcheck" APP_NAME="bandwidth" . auto/apps.sh
 
 echo 'configure ok! '
 

trunk/src/core/srs_core.hpp

@@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	(void)0
 
 // current release version
-#define RTMP_SIG_SRS_VERSION "0.9.2"
+#define RTMP_SIG_SRS_VERSION "0.9.3"
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"
 #define RTMP_SIG_SRS_ROLE "origin server"