updated build system

scripts/env.sh

@@ -253,12 +253,17 @@ fi
 PROJECT_FILE_PART=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}_${PROJECT_GIT_REV}_${PROJECT_OS}_${PROJECT_BUILD_ARCH2}
 PROJECT_OUT_FILE=${PROJECT_FILE_PART}.tar.gz
 
+if [ "${PROJECT_IS_MINGW}" == "1" ]; then
+  PROJECT_APP_BINARY_EXT=.exe
+fi
+
 export MSYS
 export NUM_JOBS
 export OPENSSL_ROOT_DIR
 export PATH
 export PKG_CONFIG_PATH
 export PROJECT_3RD_PARTY_DIR
+export PROJECT_APP_BINARY_EXT
 export PROJECT_APP_LIST
 export PROJECT_BUILD_ARCH
 export PROJECT_BUILD_ARCH2
@@ -307,6 +312,7 @@ for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
 done
 
 echo "-=[Settings]=-"
+echo "  App binary extension: ${PROJECT_APP_BINARY_EXT}"
 echo "  App list: ${PROJECT_APP_LIST[*]}"
 echo "  Build arch: ${PROJECT_BUILD_ARCH}"
 echo "  Build arch2: ${PROJECT_BUILD_ARCH2}"

scripts/make_common.sh

@@ -15,10 +15,6 @@ if [ -f "${PROJECT_SOURCE_DIR}/pre_build.sh" ]; then
   "${PROJECT_SOURCE_DIR}/pre_build.sh"
 fi
 
-if [ "${PROJECT_IS_MINGW}" == "1" ]; then
-  APP_BINARY_EXT=.exe
-fi
-
 pushd "${PROJECT_BUILD_DIR}"
 cmake "${PROJECT_SOURCE_DIR}" \
   -G"Unix Makefiles" \
@@ -57,26 +53,26 @@ fi
 for APP in ${PROJECT_APP_LIST[@]}; do
   if [ "${PROJECT_BUILD_SHARED_LIBS}" == "ON" ]; then
     if [ "${PROJECT_IS_MINGW}" != "1" ]; then
-      rm "${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}"
+      rm "${PROJECT_DIST_DIR}/${APP}${PROJECT_APP_BINARY_EXT}"
       if [ "${PROJECT_ENABLE_CURL}" == "ON" ]; then
         mv "${PROJECT_DIST_DIR}/cacert.pem" "${PROJECT_DIST_DIR}/bin/cacert.pem"
       fi
-      rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/"
+      rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${PROJECT_APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/"
-      cat <<EOF >>"${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}"
+      cat <<EOF >>"${PROJECT_DIST_DIR}/${APP}${PROJECT_APP_BINARY_EXT}"
 #!/bin/sh
 PROJECT_SCRIPTS_DIR=\$(dirname "\$0")
 PROJECT_SCRIPTS_DIR=\$(realpath \${PROJECT_SCRIPTS_DIR})
 
 export LD_LIBRARY_PATH="\${PROJECT_SCRIPTS_DIR}/lib:\${PROJECT_SCRIPTS_DIR}/lib64:\${LD_LIBRARY_PATH}"
 
-\${PROJECT_SCRIPTS_DIR}/bin/${APP}${APP_BINARY_EXT} \$*
+\${PROJECT_SCRIPTS_DIR}/bin/${APP}${PROJECT_APP_BINARY_EXT} \$*
 EOF
-      chmod +x "${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}"
+      chmod +x "${PROJECT_DIST_DIR}/${APP}${PROJECT_APP_BINARY_EXT}"
     else
-      rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/"
+      rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${PROJECT_APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/"
     fi
   else
-    rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/"
+    rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${PROJECT_APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/"
   fi
 done
 

scripts/make_package.sh

@@ -50,6 +50,14 @@ popd
 
 rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || error_exit "failed to rsync" 1
 
+for APP in ${PROJECT_APP_LIST[@]}; do
+  if [ "${PROJECT_BUILD_SHARED_LIBS}" == "ON" ]; then
+    strip ${TEMP_DIR}/${PROJECT_NAME}/bin/${APP}${PROJECT_APP_BINARY_EXT}
+  else
+    strip ${TEMP_DIR}/${PROJECT_NAME}/${APP}${PROJECT_APP_BINARY_EXT}
+  fi
+done
+
 pushd "${TEMP_DIR}/${PROJECT_NAME}/"
 IFS=$'\n'
 set -f