Windows: Refine build tmp dir names.

ossrs · Nov 16, 2022 · ceaed78 · ceaed78
1 parent a0be51b
commit ceaed78
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 68 deletions.
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
@@ -434,9 +434,9 @@ fi
 _ST_MAKE_ARGS="${_ST_MAKE} STATIC_ONLY=${_ST_STATIC_ONLY}"
 _ST_MAKE_ARGS="${_ST_MAKE_ARGS} CC=${SRS_TOOL_CC} AR=${SRS_TOOL_AR} LD=${SRS_TOOL_LD} RANDLIB=${SRS_TOOL_RANDLIB}"
 # Patched ST from https://github.com/ossrs/state-threads/tree/srs
-if [[ -f ${SRS_3RD_ST_STORE_PATH}/libst.a ]]; then
-    rm -rf ${SRS_3RD_ST_PATH} &&
-    cp -rf ${SRS_3RD_ST_STORE_PATH} ${SRS_OBJS} &&
+if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/st/libst.a ]]; then
+    rm -rf ${SRS_OBJS}/st &&
+    cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/st ${SRS_OBJS} &&
     echo -e "The state-threads is ok.";
 else
     echo "Building state-threads.";
@@ -446,8 +446,8 @@ else
         cd ${SRS_OBJS}/${SRS_PLATFORM}/st-srs  &&
         # Build source code.
         env EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" make ${_ST_MAKE_ARGS} &&
-        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/st-srs/${_ST_OBJ}/* ${SRS_3RD_ST_PATH} &&
-        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/st-srs/${_ST_OBJ}/* ${SRS_3RD_ST_STORE_PATH}
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/st-srs/${_ST_OBJ}/* ${SRS_OBJS}/st &&
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/st-srs/${_ST_OBJ}/* ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/st
     )
 fi
 # check status
@@ -556,7 +556,7 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then
         if [[ $SRS_CROSS_BUILD_ARCH == "arm" ]]; then OPENSSL_CONFIG="./Configure linux-armv4"; fi
         if [[ $SRS_CROSS_BUILD_ARCH == "aarch64" ]]; then OPENSSL_CONFIG="./Configure linux-aarch64"; fi
         if [[ $SRS_CROSS_BUILD_ARCH == "mipsel" ]]; then OPENSSL_CONFIG="./Configure linux-mips32"; fi
-    elif [[ ! -f ${SRS_3RD_OPENSSL_STORE_PATH}/lib/libssl.a ]]; then
+    elif [[ ! -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl/lib/libssl.a ]]; then
         # Try to use exists libraries.
         #if [[ -f /usr/local/ssl/lib/libssl.a && $SRS_SSL_LOCAL == NO ]]; then
         #    (mkdir -p  ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib && cd ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib &&
@@ -601,18 +601,18 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then
     #OPENSSL_OPTIONS="$OPENSSL_OPTIONS -no-ssl2 -no-comp -no-idea -no-hw -no-engine -no-dso -no-err -no-nextprotoneg -no-psk -no-srp -no-ec2m -no-weak-ssl-ciphers"
     #
     # cross build not specified, if exists flag, need to rebuild for no-arm platform.
-    if [[ -f ${SRS_3RD_OPENSSL_STORE_PATH}/lib/libssl.a ]]; then
-        rm -rf ${SRS_3RD_OPENSSL_PATH} &&
-        cp -rf ${SRS_3RD_OPENSSL_STORE_PATH} ${SRS_OBJS} &&
+    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl/lib/libssl.a ]]; then
+        rm -rf ${SRS_OBJS}/openssl &&
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl ${SRS_OBJS} &&
         echo "The $OPENSSL_CANDIDATE is ok.";
     else
         echo "Building $OPENSSL_CANDIDATE.";
         (
             rm -rf ${SRS_OBJS}/${SRS_PLATFORM}/${OPENSSL_CANDIDATE} &&
             cd ${SRS_OBJS}/${SRS_PLATFORM} &&
-            ${OPENSSL_UNZIP} && cd $OPENSSL_CANDIDATE && ${OPENSSL_CONFIG} --prefix=${SRS_3RD_OPENSSL_STORE_PATH} $OPENSSL_OPTIONS &&
+            ${OPENSSL_UNZIP} && cd $OPENSSL_CANDIDATE && ${OPENSSL_CONFIG} --prefix=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl $OPENSSL_OPTIONS &&
             make CC=${SRS_TOOL_CC} AR="${OPENSSL_AR}" LD=${SRS_TOOL_LD} RANDLIB=${SRS_TOOL_RANDLIB} ${SRS_JOBS} && make install_sw &&
-            cp -rf ${SRS_3RD_OPENSSL_STORE_PATH} ${SRS_OBJS}
+            cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl ${SRS_OBJS}
         )
     fi
     # Which lib we use.
@@ -638,7 +638,7 @@ if [[ $SRS_RTC == YES ]]; then
     # If use ASM for SRTP, we enable openssl(with ASM).
     if [[ $SRS_SRTP_ASM == YES ]]; then
         SRTP_OPTIONS="--enable-openssl"
-        SRTP_CONFIGURE="env PKG_CONFIG_PATH=${SRS_3RD_OPENSSL_PATH}/lib/pkgconfig ./configure"
+        SRTP_CONFIGURE="env PKG_CONFIG_PATH=${SRS_OBJS}/openssl/lib/pkgconfig ./configure"
     else
         SRTP_CONFIGURE="./configure"
     fi
@@ -649,24 +649,24 @@ if [[ $SRS_RTC == YES ]]; then
         SRTP_OPTIONS="$SRTP_OPTIONS --build=loongarch64-unknown-linux-gnu"
     fi
     # Patched ST from https://github.com/ossrs/state-threads/tree/srs
-    if [[ -f ${SRS_3RD_SRTP2_STORE_PATH}/lib/libsrtp2.a ]]; then
-        rm -rf ${SRS_3RD_SRTP2_PATH} &&
-        cp -rf ${SRS_3RD_SRTP2_STORE_PATH} ${SRS_OBJS} &&
+    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2/lib/libsrtp2.a ]]; then
+        rm -rf ${SRS_OBJS}/srtp2 &&
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2 ${SRS_OBJS} &&
         echo "The libsrtp-2-fit is ok.";
     else
         echo "Building libsrtp-2-fit.";
         (
-            rm -rf ${SRS_3RD_SRTP2_PATH} &&
+            rm -rf ${SRS_OBJS}/srtp2 &&
             cd ${SRS_OBJS}/${SRS_PLATFORM} &&
             rm -rf libsrtp-2-fit &&
             cp -R ${SRS_WORKDIR}/3rdparty/libsrtp-2-fit . &&
             cd libsrtp-2-fit &&
             if [[ $OS_IS_RISCV == YES ]]; then
                 patch -p0 crypto/math/datatypes.c ${SRS_WORKDIR}/3rdparty/patches/srtp/config.guess-02.patch;
             fi &&
-            $SRTP_CONFIGURE ${SRTP_OPTIONS} --prefix=${SRS_3RD_SRTP2_STORE_PATH} &&
+            $SRTP_CONFIGURE ${SRTP_OPTIONS} --prefix=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2 &&
             make ${SRS_JOBS} && make install &&
-            cp -rf ${SRS_3RD_SRTP2_STORE_PATH} ${SRS_OBJS}
+            cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2 ${SRS_OBJS}
         )
     fi
     ret=$?; if [[ $ret -ne 0 ]]; then echo "Build libsrtp failed, ret=$ret"; exit $ret; fi
@@ -684,9 +684,9 @@ if [[ $SRS_RTC == YES && $SRS_CROSS_BUILD == NO ]]; then
     if [[ $OS_IS_LOONGARCH64 = YES ]]; then
         OPUS_OPTIONS="$OPUS_OPTIONS --build=loongarch64-unknown-linux-gnu"
     fi
-    if [[ -f ${SRS_3RD_OPUS_STORE_PATH}/lib/libopus.a ]]; then
-        rm -rf ${SRS_3RD_OPUS_PATH} &&
-        cp -rf ${SRS_3RD_OPUS_STORE_PATH} ${SRS_OBJS} &&
+    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus/lib/libopus.a ]]; then
+        rm -rf ${SRS_OBJS}/opus &&
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus ${SRS_OBJS} &&
         echo "The opus-1.3.1 is ok.";
     else
         echo "Building opus-1.3.1.";
@@ -695,10 +695,10 @@ if [[ $SRS_RTC == YES && $SRS_CROSS_BUILD == NO ]]; then
             cd ${SRS_OBJS}/${SRS_PLATFORM} &&
             tar xf ${SRS_WORKDIR}/3rdparty/opus-1.3.1.tar.gz && 
             cd opus-1.3.1 &&
-            ./configure --prefix=${SRS_3RD_OPUS_STORE_PATH} --enable-static $OPUS_OPTIONS &&
+            ./configure --prefix=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus --enable-static $OPUS_OPTIONS &&
             make ${SRS_JOBS} && 
             make install &&
-            cp -rf ${SRS_3RD_OPUS_STORE_PATH} ${SRS_OBJS}
+            cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus ${SRS_OBJS}
         )
     fi
     # check status
@@ -713,7 +713,7 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
     if [[ $SRS_CROSS_BUILD == YES ]]; then
       FFMPEG_CONFIGURE=./configure
     else
-      FFMPEG_CONFIGURE="env PKG_CONFIG_PATH=${SRS_3RD_OPUS_STORE_PATH}/lib/pkgconfig ./configure"
+      FFMPEG_CONFIGURE="env PKG_CONFIG_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus/lib/pkgconfig ./configure"
     fi
 
     # Disable all asm for FFmpeg, to compatible with ARM CPU.
@@ -740,9 +740,9 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
         FFMPEG_OPTIONS="$FFMPEG_OPTIONS --enable-decoder=libopus --enable-encoder=libopus --enable-libopus"
     fi
 
-    if [[ -f ${SRS_3RD_FFMPEG_STORE_PATH}/lib/libavcodec.a ]]; then
-        rm -rf ${SRS_3RD_FFMPEG_PATH} &&
-        cp -rf ${SRS_3RD_FFMPEG_STORE_PATH} ${SRS_OBJS} &&
+    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/ffmpeg/lib/libavcodec.a ]]; then
+        rm -rf ${SRS_OBJS}/ffmpeg &&
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/ffmpeg ${SRS_OBJS} &&
         echo "The ffmpeg-4-fit is ok.";
     else
         echo "Building ffmpeg-4-fit.";
@@ -752,7 +752,7 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
             cd ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg-4-fit && 
             # Build source code.
             $FFMPEG_CONFIGURE \
-              --prefix=${SRS_3RD_FFMPEG_STORE_PATH} --pkg-config=pkg-config \
+              --prefix=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/ffmpeg --pkg-config=pkg-config \
               --pkg-config-flags="--static" --extra-libs="-lpthread" --extra-libs="-lm" \
               --disable-everything ${FFMPEG_OPTIONS} \
               --disable-programs --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages \
@@ -787,7 +787,7 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
               fi
             fi &&
             make ${SRS_JOBS} && make install &&
-            cp -rf ${SRS_3RD_FFMPEG_STORE_PATH} ${SRS_OBJS}
+            cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/ffmpeg ${SRS_OBJS}
         )
     fi
     # check status
@@ -821,14 +821,14 @@ fi
 # SRT module, https://github.com/ossrs/srs/issues/1147#issuecomment-577469119
 #####################################################################################
 if [[ $SRS_SRT == YES ]]; then
-    if [[ -f ${SRS_3RD_SRT_STORE_PATH}/lib/libsrt.a ]]; then
-        rm -rf SRS_3RD_SRT_PATH &&
-        cp -rf ${SRS_3RD_SRT_STORE_PATH} ${SRS_OBJS} &&
+    if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt/lib/libsrt.a ]]; then
+        rm -rf ${SRS_OBJS}/srt &&
+        cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt ${SRS_OBJS} &&
         echo "libsrt-1-fit is ok.";
     else
         echo "Build srt-1-fit"
         (
-            if [[ ! -d ${SRS_3RD_OPENSSL_STORE_PATH}/lib/pkgconfig ]]; then
+            if [[ ! -d ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl/lib/pkgconfig ]]; then
                 echo "OpenSSL pkgconfig no found, build srt-1-fit failed.";
                 exit -1;
             fi
@@ -855,15 +855,15 @@ if [[ $SRS_SRT == YES ]]; then
             cd ${SRS_OBJS}/${SRS_PLATFORM} &&
             cp -rf ${SRS_WORKDIR}/3rdparty/srt-1-fit ${SRS_OBJS}/${SRS_PLATFORM} && 
             cd srt-1-fit &&
-            PKG_CONFIG_PATH=${SRS_3RD_OPENSSL_PATH}/lib/pkgconfig ./configure --prefix=${SRS_3RD_SRT_STORE_PATH} $LIBSRT_OPTIONS &&
+            PKG_CONFIG_PATH=${SRS_OBJS}/openssl/lib/pkgconfig ./configure --prefix=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt $LIBSRT_OPTIONS &&
             make ${SRS_JOBS} && make install &&
 
             # If exists lib64 of libsrt, link it to lib
-            if [[ -d ${SRS_3RD_SRT_STORE_PATH}/lib64 ]]; then
-                mv ${SRS_3RD_SRT_STORE_PATH}/lib64 ${SRS_3RD_SRT_STORE_PATH}/lib
+            if [[ -d ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt/lib64 ]]; then
+                mv ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt/lib64 ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt/lib
             fi &&
 
-            cp -rf ${SRS_3RD_SRT_STORE_PATH} ${SRS_OBJS}
+            cp -rf ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt ${SRS_OBJS}
         )
         ret=$?; if [[ $ret -ne 0 ]]; then echo "Build srt-1-fit failed, ret=$ret"; exit $ret; fi
     fi

diff --git a/trunk/auto/setup_variables.sh b/trunk/auto/setup_variables.sh
@@ -28,25 +28,6 @@ if [[ $SRS_CROSS_BUILD == YES ]]; then
     SRS_PLATFORM="${SRS_PLATFORM}-crossbuild-$(echo $SRS_TOOL_CC_NAME|awk -F - '{print $1"-"$2}')"
 fi
 
-#TODO find the link lib in objs/Platform_some_platfomr/3rdpatry/some-lib
-# 3rdparty lib path
-# eg: objs/st, objs/ffmpeg etc.
-SRS_3RD_ST_PATH=${SRS_OBJS}/st
-SRS_3RD_FFMPEG_PATH=${SRS_OBJS}/ffmpeg
-SRS_3RD_OPUS_PATH=${SRS_OBJS}/opus
-SRS_3RD_SRTP2_PATH=${SRS_OBJS}/srtp2
-SRS_3RD_OPENSSL_PATH=${SRS_OBJS}/openssl
-SRS_3RD_SRT_PATH=${SRS_OBJS}/srt
-
-# 3rdparty lib store path
-# eg: objs/Platform-CYGWIN_NT-10.0-3.2.0-GCC11.2.0-SRS5-x86_64/3rdpatry/st
-SRS_3RD_ST_STORE_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/st
-SRS_3RD_FFMPEG_STORE_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/ffmpeg
-SRS_3RD_OPUS_STORE_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus
-SRS_3RD_SRTP2_STORE_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2
-SRS_3RD_OPENSSL_STORE_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl
-SRS_3RD_SRT_STORE_PATH=${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt
-
 echo "SRS_WORKDIR: ${SRS_WORKDIR}, SRS_OBJS_DIR: ${SRS_OBJS_DIR}, SRS_OBJS: ${SRS_OBJS}, SRS_PLATFORM: ${SRS_PLATFORM}"
 
 # For src object files on each platform.
@@ -63,21 +44,23 @@ echo "SRS_WORKDIR: ${SRS_WORKDIR}, SRS_OBJS_DIR: ${SRS_OBJS_DIR}, SRS_OBJS: ${SR
 
     rm -rf st ffmpeg opus srtp2 openssl srt &&
     # objs/some-lib
-    mkdir -p ${SRS_3RD_ST_PATH} &&
-    mkdir -p ${SRS_3RD_FFMPEG_PATH} &&
-    mkdir -p ${SRS_3RD_OPUS_PATH} &&
-    mkdir -p ${SRS_3RD_SRTP2_PATH} &&
-    mkdir -p ${SRS_3RD_OPENSSL_PATH} &&
-    mkdir -p ${SRS_3RD_SRT_STORE_PATH} &&
+    mkdir -p ${SRS_OBJS}/st &&
+    mkdir -p ${SRS_OBJS}/ffmpeg &&
+    mkdir -p ${SRS_OBJS}/opus &&
+    mkdir -p ${SRS_OBJS}/srtp2 &&
+    mkdir -p ${SRS_OBJS}/openssl &&
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt &&
 
     # objs/Platform_some_platform/3rdpatry/some-lib
-    mkdir -p ${SRS_3RD_ST_STORE_PATH} &&
-    mkdir -p ${SRS_3RD_FFMPEG_STORE_PATH} &&
-    mkdir -p ${SRS_3RD_OPUS_STORE_PATH} &&
-    mkdir -p ${SRS_3RD_SRTP2_STORE_PATH} &&
-    mkdir -p ${SRS_3RD_OPENSSL_STORE_PATH} &&
-    mkdir -p ${SRS_3RD_SRT_STORE_PATH}
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/st &&
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/ffmpeg &&
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/opus &&
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srtp2 &&
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/openssl &&
+    mkdir -p ${SRS_OBJS}/${SRS_PLATFORM}/3rdpatry/srt
 )
+ret=$?; if [[ $ret -ne 0 ]]; then echo "Create build directory failed, ret=$ret"; exit $ret; fi
+
 if [[ $SRS_CLEAN == NO ]]; then
   echo "Fast cleanup, if need to do full cleanup, please use: make clean"
 fi