diff --git a/packaging/release.sh b/packaging/release.sh index a4562d21d2bd15fa6c4ba3067f6046427bf60c2c..b0e56595f1c440b8c9c0764a54ea1c1129eed50a 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 6120f9fcc2bb676b716be5172967bd7dfe2f0090..90d7b937108a77b87d3eb8ce69be32c48384950a 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 d39cf418434dc75b90602428f07475f3c796067a..18bb03b489feac4331b2eb38b669ffc6832ccca7 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