!4594 自动化打包金融版本

Merge pull request !4594 from liuheng/fix4

build.sh

@@ -12,6 +12,7 @@ declare build_binarylib_dir='None'
 declare wrap_binaries='NO'
 declare not_optimized=''
 declare config_file=''
+declare product_mode='opengauss'
 #########################################################################
 ##read command line paramenters
 #######################################################################
@@ -27,6 +28,7 @@ function print_help()
     -nopt|--not_optimized             on kunpeng platform, like 1616 version, without LSE optimized
     -f|--config_file                  set postgresql.conf.sample from config_file when packing
     -T|--tassl                        build with tassl
+    -pm|--product_mode                this values of paramenter is opengauss or lite or finance, the default value is opengauss.
     "
 }
 
@@ -69,6 +71,10 @@ while [ $# -gt 0 ]; do
             config_file=$(realpath "$2")
             shift 2
             ;;
+        -pm|--product_mode)
+            product_mode=$2
+            shift 2
+            ;;
         -T|--tassl)
             build_with_tassl='-T'
             shift 1
@@ -86,14 +92,13 @@ ROOT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 echo "ROOT_DIR : $ROOT_DIR"
 cd build/script
 chmod a+x build_opengauss.sh
-./build_opengauss.sh -m ${build_version_mode} -3rd ${build_binarylib_dir} ${not_optimized} -pkg server ${build_with_tassl}
-if [ "${wrap_binaries}"X = "YES"X ]
-then
+./build_opengauss.sh -m ${build_version_mode} -3rd ${build_binarylib_dir} ${not_optimized} -pkg server ${build_with_tassl} -pm ${product_mode}
+if [ "${wrap_binaries}"X = "YES"X ]; then
     chmod a+x package_opengauss.sh
     if [ X$config_file = "X" ];then
-        ./package_opengauss.sh -3rd ${build_binarylib_dir} -m ${build_version_mode}
+        ./package_opengauss.sh -3rd ${build_binarylib_dir} -m ${build_version_mode} -pm ${product_mode}
     else
-        ./package_opengauss.sh -3rd ${build_binarylib_dir} -m ${build_version_mode} -f ${config_file}
+        ./package_opengauss.sh -3rd ${build_binarylib_dir} -m ${build_version_mode} -f ${config_file} -pm ${product_mode}
     fi
 fi
 exit 0

build/script/package_opengauss.sh

@@ -40,7 +40,7 @@ function print_help()
     -3rd|--binarylib_dir   the directory of third party binarylibs.
     -pkg|--package         provode type of installation packages, values parameter is server.
     -m|--version_mode      this values of paramenter is debug, release, memcheck, the default value is release.
-    -pm|--product_mode     this values of paramenter is opengauss or lite, the default value is opengauss.
+    -pm|--product_mode     this values of paramenter is opengauss or lite or finance, the default value is opengauss.
 "
 }
 

build/script/utils/cmake_compile.sh

@@ -144,7 +144,7 @@ function install_gaussdb()
         echo "WARNING: do not separate symbol in debug mode!"
     fi
 
-    if [ "$product_mode" != "opengauss" -a "$product_mode" != "lite" ]; then
+    if [ "$product_mode" != "opengauss" -a "$product_mode" != "lite" -a "$product_mode" != "finance" ]; then
         die "the product mode can only be opengauss, lite!"
     fi
 

build/script/utils/make_compile.sh

@@ -134,7 +134,7 @@ function install_gaussdb()
         echo "WARNING: do not separate symbol in debug mode!"
     fi
 
-    if [ "$product_mode" != "opengauss" -a "$product_mode" != "lite" ]; then
+    if [ "$product_mode" != "opengauss" -a "$product_mode" != "lite" -a "$product_mode" != "finance" ]; then
         die "the product mode can only be opengauss, lite!"
     fi
 
@@ -201,7 +201,7 @@ function install_gaussdb()
         elif [ "$version_mode"x == "memcheck"x ]; then
             ./configure $shared_opt CFLAGS='-O0' --enable-debug --enable-cassert --enable-memory-check CC=g++ $extra_config_opt --enable-finance-mode >> "$LOG_FILE" 2>&1
         else
-            ./configure $shared_opt CFLAGS="-O0 ${GAUSSDB_EXTRA_FLAGS}" --enable-debug --enable-cassert CC=g++ $extra_config_opt  --enable-finance-mode>> "$LOG_FILE" 2>&1
+            ./configure $shared_opt CFLAGS="-O0 ${GAUSSDB_EXTRA_FLAGS}" --enable-debug --enable-cassert CC=g++ $extra_config_opt --enable-finance-mode>> "$LOG_FILE" 2>&1
         fi
     fi
 

configure

@@ -2681,8 +2681,13 @@ else
   commits=$(git log 2>/dev/null | grep "See in merge request" | wc -l)
   debug_str=""
   mrid=$(git log 2>/dev/null | grep "See merge request" | head -1 | awk -F! '{print $2}' | grep -o '[0-9]\+')
+
+  if test "${enable_finance_mode}" = yes; then
+      product="${product}-finance"
+  fi
+
   if test "$enable_debug" = yes; then
-    debug_str="debug"
+      debug_str="debug"
   fi
 
   if test "$enable_ccache" = yes; then