From 7de0f1d39df0fb9c75f3229f18a8cf1195288e5f Mon Sep 17 00:00:00 2001
From: lihui <huili@taosdata.com>
Date: Mon, 30 Mar 2020 12:53:03 +0800
Subject: [PATCH] [TD-70]

---
 packaging/release.sh          | 18 ++++++++++++------
 packaging/tools/makeclient.sh |  7 ++++++-
 packaging/tools/makepkg.sh    |  7 ++++++-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/packaging/release.sh b/packaging/release.sh
index a4562d21d2..b0e56595f1 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -10,6 +10,7 @@ set -e
 #             -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  
 #             -V [stable | beta]
 #             -l [full | lite]
+#             -u [yes | no]
 
 # set parameters by default value
 verMode=edge     # [cluster, edge]
@@ -17,8 +18,9 @@ verType=stable   # [stable, beta]
 cpuType=x64      # [aarch32 | aarch64 | x64 | x86 | mips64 ...]
 osType=Linux     # [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]
 pagMode=full     # [full | lite]
+cloudVer=no      # [yes | no]
 
-while getopts "hv:V:c:o:l:" arg
+while getopts "hv:V:c:o:l:u:" arg
 do
   case $arg in
     v)
@@ -41,8 +43,12 @@ do
       #echo "osType=$OPTARG"
       osType=$(echo $OPTARG)
       ;;
+    u)
+      #echo "cloudVer=$OPTARG"
+      cloudVer=$(echo $OPTARG)
+      ;;
     h)
-      echo "Usage: `basename $0` -v [cluster | edge]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta] -l [full | lite]"
+      echo "Usage: `basename $0` -v [cluster | edge]  -c [aarch32 | aarch64 | x64 | x86 | mips64 ...] -o [Linux | Kylin | Alpine | Raspberrypi | Darwin | Windows | ...]  -V [stable | beta] -l [full | lite] -u [yes | no]"
       exit 0
       ;;
     ?) #unknow option 
@@ -52,7 +58,7 @@ do
   esac
 done
 
-echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode}"
+echo "verMode=${verMode} verType=${verType} cpuType=${cpuType} osType=${osType} pagMode=${pagMode} cloudVer=${cloudVer}"
 
 curr_dir=$(pwd)
 
@@ -204,7 +210,7 @@ if [[ "$cpuType" == "x64" ]] || [[ "$cpuType" == "aarch64" ]] || [[ "$cpuType" =
     if [ "$verMode" != "cluster" ]; then
       cmake ../ -DCPUTYPE=${cpuType} -DPAGMODE=${pagMode}
     else
-      cmake ../../ -DCPUTYPE=${cpuType}
+      cmake ../../ -DCPUTYPE=${cpuType} -DCLOUDVER=${cloudVer}
     fi
 else
     echo "input cpuType=${cpuType} error!!!"
@@ -244,8 +250,8 @@ if [ "$osType" != "Darwin" ]; then
     echo "====do tar.gz package for all systems===="
     cd ${script_dir}/tools
     
-	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
-	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+	${csudo} ./makepkg.sh    ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${cloudVer}
+	${csudo} ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${cloudVer}
 else
     cd ${script_dir}/tools
     ./makeclient.sh ${compile_dir} ${version} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType}
diff --git a/packaging/tools/makeclient.sh b/packaging/tools/makeclient.sh
index 6120f9fcc2..90d7b93710 100755
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
@@ -13,6 +13,7 @@ osType=$5
 verMode=$6
 verType=$7
 pagMode=$8
+cloudVer=$9
 
 if [ "$osType" != "Darwin" ]; then
     script_dir="$(dirname $(readlink -f $0))"
@@ -122,7 +123,11 @@ fi
 cd ${release_dir} 
 
 if [ "$verMode" == "cluster" ]; then
-  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+  if [ "$cloudVer" == "yes" ]; then
+    pkg_name=${install_dir}-cloud-${version}-${osType}-${cpuType}
+  else
+    pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+  fi 
 elif [ "$verMode" == "edge" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index d39cf41843..18bb03b489 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -14,6 +14,7 @@ osType=$5
 verMode=$6
 verType=$7
 pagMode=$8
+cloudVer=$9
 
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
@@ -131,7 +132,11 @@ fi
 cd ${release_dir} 
 
 if [ "$verMode" == "cluster" ]; then
-  pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+  if [ "$cloudVer" == "yes" ]; then
+    pkg_name=${install_dir}-cloud-${version}-${osType}-${cpuType}
+  else
+    pkg_name=${install_dir}-${version}-${osType}-${cpuType}
+  fi  
 elif [ "$verMode" == "edge" ]; then
   pkg_name=${install_dir}-${version}-${osType}-${cpuType}
 else
-- 
GitLab