Merge pull request #23 from msojocs/build

add: 打包时带上工具版本号
This commit is contained in:
msojocs 2022-03-04 23:41:11 +08:00 committed by GitHub
commit 6c47ba6f4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 8 deletions

3
.gitignore vendored
View File

@ -13,4 +13,5 @@ build
*.AppImage *.AppImage
appimage-builder-cache appimage-builder-cache
wcc.bin wcc.bin
wcsc.bin wcsc.bin
temp.sh

10
res/aur/PKGBUILD Executable file → Normal file
View File

@ -7,9 +7,11 @@
# https://github.com/dragonation/wechat-devtools # https://github.com/dragonation/wechat-devtools
# https://github.com/cytle/wechat_web_devtools # https://github.com/cytle/wechat_web_devtools
_wechat_devtools_ver="1.05.2201240" _wechat_devtools_ver="1.05.2203030"
_wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe" # https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052203030&version_type=1
_wechat_devtools_md5="85552bae33e98eb186c5068419efce03" _wechat_devtools_url="https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=${_wechat_devtools_ver//\./}&version_type=1"
# _wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe"
_wechat_devtools_md5="63cb0e75df3704e155185d900258ac1e"
_wechat_devtools_exe="wechat_devtools_${_wechat_devtools_ver}_x64.exe" _wechat_devtools_exe="wechat_devtools_${_wechat_devtools_ver}_x64.exe"
_nwjs_ver="0.53.1" _nwjs_ver="0.53.1"
@ -18,7 +20,7 @@ _node_version="16.1.0"
pkgname=wechat-devtools pkgname=wechat-devtools
pkgver="${_wechat_devtools_ver}" # 主版本号 pkgver="${_wechat_devtools_ver}" # 主版本号
pkgrel=15 # 次版本号release pkgrel=1 # 次版本号release
epoch=2 # 大版本迭代强制更新(维护者变更,尽量不用) epoch=2 # 大版本迭代强制更新(维护者变更,尽量不用)
pkgdesc="WeChat Devtools For Linux. " pkgdesc="WeChat Devtools For Linux. "
arch=("x86_64") arch=("x86_64")

View File

@ -60,6 +60,8 @@ cd "$app_dir"
# appimagetool $app_dir # appimagetool $app_dir
notice "MAKE APPIMAGE" notice "MAKE APPIMAGE"
"$tmp_dir/appimagetool-x86_64.AppImage" "$app_dir" "$build_dir/WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}.AppImage" ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )
ver="${ver//\"/}"
"$tmp_dir/appimagetool-x86_64.AppImage" "$app_dir" "$build_dir/WeChat_Dev_Tools_${ver}_${VERSION}_${ARCH}_${TYPE}.AppImage"
rm -rf $app_dir rm -rf $app_dir

View File

@ -46,4 +46,6 @@ notice "BUILD DEB Package"
cd "$root_dir/tmp/deb" cd "$root_dir/tmp/deb"
ls -l "$root_dir/tmp/deb" ls -l "$root_dir/tmp/deb"
mkdir -p "$root_dir/tmp/build" mkdir -p "$root_dir/tmp/build"
dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_$BUILD_VERSION.deb" ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )
ver="${ver//\"/}"
dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_${ver}_$BUILD_VERSION.deb"

View File

@ -49,6 +49,9 @@ rm -rf "$build_dir/nwjs/node"
\cp -rf "$root_dir/node/bin/node" "$build_dir/nwjs/node" \cp -rf "$root_dir/node/bin/node" "$build_dir/nwjs/node"
notice "COPY package.nw" notice "COPY package.nw"
\cp -rf "$root_dir/package.nw" "$build_dir/package.nw" \cp -rf "$root_dir/package.nw" "$build_dir/package.nw"
notice "MAKE tar.gz" notice "MAKE tar.gz"
cd "$tmp_dir/tar" && tar -zcf "$store_dir/WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}.tar.gz" "WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}" ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )
ver="${ver//\"/}"
cd "$tmp_dir/tar" && tar -zcf "$store_dir/WeChat_Dev_Tools_${ver}_${VERSION}_${ARCH}_${TYPE}.tar.gz" "WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}"
rm -rf $build_dir rm -rf $build_dir