Commit 6c47ba6

authored

Merge pull request #23 from msojocs/build

add: 打包时带上工具版本号

2 parents d0a7907 + 2d7d826 commit 6c47ba6Copy full SHA for 6c47ba6

File tree

+18

-8

lines changed

+18

-8

lines changed

Lines changed: 2 additions & 1 deletion

100755100644

Lines changed: 6 additions & 4 deletions

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

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ cd "$app_dir"`
`60`	`60`
`61`	`61`	`# appimagetool $app_dir`
`62`	`62`	`notice "MAKE APPIMAGE"`
`63`		`-"$tmp_dir/appimagetool-x86_64.AppImage" "$app_dir" "$build_dir/WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}.AppImage"`
	`63`	`+ver=$( cat "$root_dir/package.nw/package.json" \| grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )`
	`64`	`+ver="${ver//\"/}"`
	`65`	`+"$tmp_dir/appimagetool-x86_64.AppImage" "$app_dir" "$build_dir/WeChat_Dev_Tools_${ver}_${VERSION}_${ARCH}_${TYPE}.AppImage"`
`64`	`66`
`65`	`67`	`rm -rf $app_dir`

Lines changed: 3 additions & 1 deletion

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

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ rm -rf "$build_dir/nwjs/node"`
`49`	`49`	`\cp -rf "$root_dir/node/bin/node" "$build_dir/nwjs/node"`
`50`	`50`	`notice "COPY package.nw"`
`51`	`51`	`\cp -rf "$root_dir/package.nw" "$build_dir/package.nw"`
	`52`	`+`
`52`	`53`	`notice "MAKE tar.gz"`
`53`		`-cd "$tmp_dir/tar" && tar -zcf "$store_dir/WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}.tar.gz" "WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}"`
	`54`	`+ver=$( cat "$root_dir/package.nw/package.json" \| grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )`
	`55`	`+ver="${ver//\"/}"`
	`56`	`+cd "$tmp_dir/tar" && tar -zcf "$store_dir/WeChat_Dev_Tools_${ver}_${VERSION}_${ARCH}_${TYPE}.tar.gz" "WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}"`
`54`	`57`	`rm -rf $build_dir`

Comments

(0)