diff --git a/Makefile b/Makefile index b15cef2..6d92c57 100644 --- a/Makefile +++ b/Makefile @@ -3,24 +3,17 @@ build_root=`pwd` project=ems -# 文件路径 -vfile="emsVersion" -# 获取当前时间 -current_date=$(date "+%Y-%m-%d %H:%M:%S") -# 读取版本信息 -version=$(grep "Version:" $vfile | awk '{print $3}') # os platform platform=ub22 -# 输出版本信息和更新后的日期 -echo "Version: $version" -echo "Release Date: $current_date" + build_dir=$(build_root)/build release_dir=$(build_root)/release +extra_dir=$(build_root)/extra package_name=$(project)-$(version)-$(platform) package_dir=$(package_name) @@ -30,6 +23,16 @@ svc_bin=$(svc_root)/bin web_root=$(build_root)/../web.ems package_file=$(package_name).tgz +# 获取当前时间 +current_date=$(date "+%Y-%m-%d %H:%M:%S") +# 文件路径 +vfile=$(extra_dir)/emsVersion +# 读取版本信息 +version=$(grep "Version:" $(vfile) | awk '{print $3}') +# 输出版本信息和更新后的日期 +echo "Version: $version" +echo "Release Date: $current_date" + package: rm -rf $(build_dir) mkdir -p $(build_dir) @@ -39,7 +42,7 @@ package: # cp extra file # update release date sed -i "s/Release Date:.*/Release Date: $(current_date)/" $(vfile) - cp -rf $(build_root)/extra/* $(build_dir) + cp -rf $(extra_dir)/* $(build_dir) # cp web file mkdir -p $(build_dir)/web cp -rf $(web_root)/* $(build_dir)/web