diff --git a/build/pack/build.sh b/build/pack/build.sh index 1a59975..ba2f36f 100755 --- a/build/pack/build.sh +++ b/build/pack/build.sh @@ -3,20 +3,24 @@ #prepare the variables. # version name -VERSION_NAME=3.0.0-beta.1 +VERSION_NAME=tank-3.0.0.beta1 # eg. amd64 GOARCH=$(go env GOARCH) # eg. darwin GOOS=$(go env GOOS) -# service dir eg. /data/tank/build/service +# service dir eg. /data/tank/build/pack SERVICE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # project dir eg. /data/tank PROJECT_DIR=$(dirname $(dirname ${SERVICE_DIR})) +# build dir +BUILD_DIR=${PROJECT_DIR}/build # final zip file name. FILE_NAME=${VERSION_NAME}.${GOOS}-${GOARCH}.tar.gz -# zip dist dir +# zip dist dir eg. /data/tank/tmp/dist DIST_DIR=${PROJECT_DIR}/tmp/dist -# final dist path +# component dir eg. /data/tank/tmp/dist/tank-3.0.0.beta1 +COMPONENT_DIR=${DIST_DIR}/${VERSION_NAME} +# final dist path eg. /data/tank/tmp/dist/tank-3.0.0.beta1.darwin-amd64.tar.gz DIST_PATH=${DIST_DIR}/${FILE_NAME} cd ${PROJECT_DIR} @@ -25,36 +29,29 @@ echo "go build -mod=readonly" go build -mod=readonly # if a directory -if [[ ! -d DIST_DIR ]] ; then - mkdir -p ${DIST_DIR} +if [[ -d COMPONENT_DIR ]] ; then + rm -rf ${COMPONENT_DIR} + mkdir ${COMPONENT_DIR} +else + mkdir -p ${COMPONENT_DIR} fi -# if a directory -if [ -d $distPath ] ; then - echo "clear $distPath" - rm -rf $distPath -fi - -echo "create directory $distPath" -mkdir $distPath - echo "copying cmd tank" -cp "$GOPATH/bin/tank" $distPath +cp ./tank ${COMPONENT_DIR} echo "copying build" -cp -r "$GOPATH/src/tank/build/." $distPath +cp -r ${BUILD_DIR}/* ${COMPONENT_DIR} echo "remove pack" -rm -rf $distPath/pack +rm -rf ${COMPONENT_DIR}/pack echo "remove doc" -rm -rf $distPath/doc +rm -rf ${COMPONENT_DIR}/doc echo "compress to tar.gz" -echo "tar -zcvf $distFolder/$FILE_NAME ./$VERSION_NAME" -cd $distPath -cd .. -tar -zcvf $distFolder/$FILE_NAME ./$VERSION_NAME +echo "tar -zcvf $DIST_PATH $COMPONENT_DIR" -echo "check the dist file in $distPath" -echo "finish!" \ No newline at end of file +cd ${DIST_DIR} +tar -zcvf ${DIST_PATH} ./${VERSION_NAME} + +echo "finish packaging!" \ No newline at end of file diff --git a/code/core/config.go b/code/core/config.go index 8e4293b..8ac3615 100644 --- a/code/core/config.go +++ b/code/core/config.go @@ -15,7 +15,7 @@ const ( TABLE_PREFIX = "tank20_" //当前版本 - VERSION = "3.0.0-beta.1" + VERSION = "3.0.0.beta1" ) type Config interface {