fix: 可视化设计

4 files changed, 25 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61ab3d6d7414..3562a0a85a14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = wechat-devtools
-	pkgdesc = WeChat Devtools Linux version.
+	pkgdesc = WeChat Devtools For Linux.
 	pkgver = 1.05.2201240
-	pkgrel = 12
+	pkgrel = 13
 	epoch = 2
 	url = https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html
 	arch = x86_64
 	license = unknown
 	makedepends = p7zip
 	makedepends = python2
+	makedepends = openssl
+	makedepends = gcc
+	makedepends = make
+	makedepends = libssh2
+	makedepends = krb5
 	depends = gconf
 	depends = libxkbfile
 	options = !strip
 	source = nwjs-v0.53.1.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.53.1/nwjs-sdk-v0.53.1-linux-x64.tar.gz
 	source = wechat_devtools_1.05.2201240_x64.exe::https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe
 	source = node-v16.1.0.tar.gz::https://npm.taobao.org/mirrors/node/v16.1.0/node-v16.1.0-linux-x64.tar.gz
-	source = compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.14/compiler.tar.gz
+	source = compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.17/compiler.tar.gz
 	source = wechat-devtools.desktop
 	source = logo.svg
 	source = fix-cli.sh
@@ -28,8 +33,8 @@ pkgbase = wechat-devtools
 	md5sums = b6f49803c51d0abacca2d1e566c7fe19
 	md5sums = 85552bae33e98eb186c5068419efce03
 	md5sums = 2280bfbbf29981fd5adce334f40146ff
-	md5sums = 43cc0fabc8e37fe9cea1fff89989938a
-	md5sums = 6f64dd5f4bf7a395b0241d8ac1c93ab5
+	md5sums = 87a3849f7105f411bee25da9532b0382
+	md5sums = 1abd6b4ebbbb918f601a6c5dbad55a05
 	md5sums = 0f4353664123320280ea4d6bb295dce2
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index da08ca13c956..5ca5c469566a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,19 +18,19 @@ _node_version="16.1.0"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=12   # 次版本号release
+pkgrel=13   # 次版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
-pkgdesc="WeChat Devtools Linux version. "
+pkgdesc="WeChat Devtools For Linux. "
 arch=("x86_64")
 url="https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html"
 license=('unknown')
 depends=('gconf' 'libxkbfile')
-makedepends=('p7zip' 'python2')
-# compiler 用于可视化
+makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5')
+# compiler 用于可视化,以及编译
 source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-x64.tar.gz"
         "${_wechat_devtools_exe}::${_wechat_devtools_url}"
         "node-v${_node_version}.tar.gz::https://npm.taobao.org/mirrors/node/v${_node_version}/node-v${_node_version}-linux-x64.tar.gz"
-        "compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.14/compiler.tar.gz"
+        "compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.17/compiler.tar.gz"
         "wechat-devtools.desktop"
         "logo.svg"
         "fix-cli.sh"
@@ -44,7 +44,7 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
 md5sums=(b6f49803c51d0abacca2d1e566c7fe19   # nwjs
          "${_wechat_devtools_md5}"
          2280bfbbf29981fd5adce334f40146ff   # nodejs
-         43cc0fabc8e37fe9cea1fff89989938a   # compiler
+         87a3849f7105f411bee25da9532b0382   # compiler
          1abd6b4ebbbb918f601a6c5dbad55a05   # desktop
          0f4353664123320280ea4d6bb295dce2   # svg
          "SKIP"
diff --git a/fix-core.sh b/fix-core.sh
index 3f70c50bc192..a34f09139588 100755
--- a/fix-core.sh
+++ b/fix-core.sh
@@ -3,9 +3,11 @@ echo "Fix Core"
 
 package_dir="$srcdir/wechat_devtools/code/package.nw"
 tmp_dir=$(mktemp -d)
+unpack_script="$srcdir/wxvpkg_unpack"
+pack_script="$srcdir/wxvpkg_pack"
 
 # unpack 文件 到 路径
-node "$srcdir/wxvpkg_unpack" "$package_dir/core.wxvpkg" "$tmp_dir/core.wxvpkg"
+node "$unpack_script" "$package_dir/core.wxvpkg" "$tmp_dir/core.wxvpkg"
 
 #    ____  _____ ____  _        _    ____ _____    ____ ___  ____  _____ 
 #   |  _ \| ____|  _ \| |      / \  / ___| ____|  / ___/ _ \|  _ \| ____|
@@ -57,5 +59,5 @@ fi
 
 # pack 路径 到 文件
 echo "pack"
-node "$srcdir/wxvpkg_pack" "$tmp_dir/core.wxvpkg" "$package_dir/core.wxvpkg"
-rm -rf "$tmp_dir"
\ No newline at end of file
+node "$pack_script" "$tmp_dir/core.wxvpkg" "$package_dir/core.wxvpkg"
+rm -rf "$tmp_dir/core.wxvpkg"
diff --git a/rebuild-modules.sh b/rebuild-modules.sh
index 9f82685fc227..e58bca78edd6 100755
--- a/rebuild-modules.sh
+++ b/rebuild-modules.sh
@@ -102,12 +102,13 @@ cp -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" "${package_dir}/no
 (cp -fr "${package_dir}/node_modules_tmp/node_modules/oniguruma" "${package_dir}/node_modules_tmp/node_modules/oniguruma-node")
 (cp -fr "${package_dir}/node_modules_tmp/node_modules/spdlog" "${package_dir}/node_modules_tmp/node_modules/spdlog-node")
 
-(cd "${package_dir}/node_modules_tmp/node_modules" && find -name "obj.target" | xargs -I{} rm -rf {})
-(cd "${package_dir}/node_modules_tmp/node_modules" && find -name "*.node" | xargs -I{} cp -rf {} ${package_dir}/node_modules/{})
+(cd "${package_dir}/node_modules_tmp/node_modules" && find -name ".deps" | xargs -I{} rm -rf {} && find -name "obj.target" | xargs -I{} rm -rf {} && find -name "*.a" -delete && find -name "*.lib" -delete && find -name "*.mk" -delete)
+(cd "${package_dir}/node_modules_tmp/node_modules" && find -name "*.node" | xargs -I{} \cp -rf {} ${package_dir}/node_modules/{})
 
 mkdir -p "${package_dir}/node_modules/vscode-ripgrep/bin"
-cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg"
+\cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg"
 
+(cd "${package_dir}/node_modules" && find -name ".deps" | xargs -I{} rm -rf {} && find -name "obj.target" | xargs -I{} rm -rf {} && find -name "*.a" -delete && find -name "*.lib" -delete && find -name "*.mk" -delete && find -name "*Makefile" -delete && find -name "*gyp*" -delete)
 rm -rf "${package_dir}/node_modules_tmp"
 
 # 移除旧配置