fix: wcc编译器及cli

修复wcc编译器不支持单文件编译的bug
修复cli异常

5 files changed, 63 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 295885e2d2ff..aba658db313c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-devtools
 	pkgdesc = WeChat Devtools For Linux.
 	pkgver = 1.05.2204250
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html
 	arch = x86_64
@@ -19,7 +19,7 @@ pkgbase = wechat-devtools
 	source = nwjs-v0.55.0.tar.gz::https://npm.taobao.org/mirrors/nwjs/v0.55.0/nwjs-sdk-v0.55.0-linux-x64.tar.gz
 	source = wechat_devtools_1.05.2204250_x64.exe::https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052204250&version_type=1
 	source = node-v16.4.2.tar.gz::https://npm.taobao.org/mirrors/node/v16.4.2/node-v16.4.2-linux-x64.tar.gz
-	source = compiler.tar.gz::https://github.rc1844.workers.dev/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204250-1/compiler.tar.gz
+	source = compiler.tar.gz::https://gh2.yanqishui.work/https://github.com/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204250-2/compiler.tar.gz
 	source = wechat-devtools.desktop
 	source = logo.svg
 	source = wechat-devtools
@@ -35,7 +35,7 @@ pkgbase = wechat-devtools
 	md5sums = ac7680788544c457daee11aaf69798fe
 	md5sums = 0073a70263614777fc41f21afbfc377d
 	md5sums = 4d14589085ebbf79ce504dc27330d33b
-	md5sums = c9db65748a8cf499cc9b8c2ade3a6b3f
+	md5sums = 4dc5a6b3b5087afb1bba353c20bdb30a
 	md5sums = 4d3f5273be80a74741c841fcfa4185d3
 	md5sums = 0f4353664123320280ea4d6bb295dce2
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2eaedb24d75c..3c065abf7876 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _node_version="16.4.2"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=1   # 修订版本号release
+pkgrel=2   # 修订版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools For Linux. "
 arch=("x86_64")
@@ -32,7 +32,7 @@ makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5')
 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://github.rc1844.workers.dev/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204250-1/compiler.tar.gz"
+        "compiler.tar.gz::https://gh2.yanqishui.work/https://github.com/msojocs/wechat-web-devtools-linux/releases/download/v1.05.2204250-2/compiler.tar.gz"
         "wechat-devtools.desktop"
         "logo.svg"
         "wechat-devtools"
@@ -48,7 +48,7 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs
 md5sums=(ac7680788544c457daee11aaf69798fe   # nwjs
          "${_wechat_devtools_md5}"
          4d14589085ebbf79ce504dc27330d33b   # nodejs
-         c9db65748a8cf499cc9b8c2ade3a6b3f   # compiler
+         4dc5a6b3b5087afb1bba353c20bdb30a   # compiler
          4d3f5273be80a74741c841fcfa4185d3   # desktop
          0f4353664123320280ea4d6bb295dce2   # svg
          "SKIP"
diff --git a/fix-cli.sh b/fix-cli.sh
index f58f524413d0..3cd64791f10a 100755
--- a/fix-cli.sh
+++ b/fix-cli.sh
@@ -11,5 +11,7 @@ fi
 
 cd "$NW_PACKAGE_DIR"
 
-sed -i 's#AppData/Local/\${global.userDirName}/User Data/Default#.config/\${global.userDirName}/Default#g' js/common/cli/index.js
+sed -i 's#AppData/Local/\${global.userDirName}/User Data/\${global.productHash}/Default#.config/\${global.userDirName}/Default#g' js/common/cli/index.js
 sed -i 's#USERPROFILE#HOME#g' js/common/cli/index.js
+sed -i 's#`./\${global.appname}.exe`#`./bin/\${global.appname}`#g' js/common/cli/index.js
+sed -i 's#,""));const T#,""));_.$0="wechat-devtools-cli";const T#' js/common/cli/index.js
diff --git a/rebuild-node-modules.sh b/rebuild-node-modules.sh
index f6253b0f3a09..4598f3da115c 100755
--- a/rebuild-node-modules.sh
+++ b/rebuild-node-modules.sh
@@ -3,6 +3,11 @@
 # 1 ---- NW版本
 
 set -e
+
+notice() {
+    echo -e "\033[36m $1 \033[0m "
+}
+
 root_dir=$(cd `dirname $0`/.. && pwd -P)
 package_dir="$root_dir/package.nw"
 export PATH="$root_dir/node/bin:$PATH"
@@ -26,17 +31,6 @@ hash nw-gyp 2>/dev/null || {
   exit 1
 }
 
-# 代理处理
-# echo "尝试取消所有代理"
-# unset http_proxy
-# unset HTTP_PROXY
-# unset https_proxy
-# unset HTTPS_PROXY
-# unset socket_proxy
-# unset SOCKET_PROXY
-# unset all_proxy
-# unset ALL_PROXY
-
 echo -e "\033[42;37m ######## 版本信息 $(date '+%Y-%m-%d %H:%M:%S') ########\033[0m"
 echo "NW VERSION: $NW_VERSION"
 echo "nw-gyp version: $( nw-gyp --version )"
@@ -45,30 +39,33 @@ echo "npm version: $(npm --version )"
 python --version
 python3 --version
 
-rm -fr "${package_dir}/node_modules/vscode-windows-ca-certs" # the module is only available in windows
-rm -fr "${package_dir}/node_modules/vscode-windows-registry" # the module is only available in windows
-rm -fr "${package_dir}/node_modules/vscode-windows-registry-node" # the module is only available in windows
-rm -fr "${package_dir}/node_modules/windows-process-tree" # the module is only available in windows
+# these modules are only available in windows
+cd "${package_dir}/node_modules" && \
+rm -fr "vscode-windows-ca-certs" "vscode-windows-registry" "vscode-windows-registry-node" "windows-process-tree"
 
-rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin" # redownload bin on linux
+rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin/"* # redownload bin on linux
+# https://github.com/microsoft/ripgrep-prebuilt
+cd "${package_dir}/node_modules/vscode-ripgrep" && \
+mkdir -p tmp && cd tmp
 
-rm -fr "${package_dir}/node_modules/node-pty" "${package_dir}/node_modules/node-pty-node" # the native module is not available in windows
+if [ "$ACTION_MODE" != "true" ]; then
+    notice "非ACTION模式, 设置镜像源"
+    prefix="https://gh2.yanqishui.work/"
+fi
+wget ${prefix}https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -O ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz
+tar xvf ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -C ../bin && \
+cd .. && rm -rf tmp
 
-(cd "${package_dir}/node_modules" && find -name *.pdb | xargs -I{} rm -r {}) # remove pdb debugging file
+(cd "${package_dir}/node_modules" && \
+find -name *.pdb | xargs -I{} rm -rf {} && \
+find -name *.lib | xargs -I{} rm -rf {} && \
+find -name *.exe | xargs -I{} rm -rf {} && \
+find -name *.dll | xargs -I{} rm -rf {}) # remove pdb debugging file
 
 rm -fr "${package_dir}/node_modules_tmp" # remove previous hacking tmp 
-mkdir -p "${package_dir}/node_modules_tmp"
-cp -fr "${package_dir}/node_modules" "${package_dir}/node_modules_tmp/node_modules" 
-
-rm -fr "${package_dir}/node_modules_tmp/node_modules/node-pty"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/node-pty-node"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/native-watchdog"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/oniguruma-node"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/nodegit"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog"
-rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node"
+mkdir -p "${package_dir}/node_modules_tmp/node_modules"
 
+notice "install modules"
 max_thread=$(cat /proc/cpuinfo| grep "processor"| wc -l)
 export JOBS=$max_thread
 (cd "${package_dir}/node_modules_tmp" && npm install \
@@ -80,39 +77,43 @@ export JOBS=$max_thread
     spdlog@0.11.1 \
     trash \
     vscode-oniguruma \
-    @vscode/ripgrep \
     nodegit \
     --registry=https://registry.npmmirror.com \
     --nodegit_binary_host_mirror=https://npmmirror.com/mirrors/nodegit/v0.27.0/ ) # reinstall modules
 
 # rebuild
-cd "$package_dir/node_modules_tmp/node_modules/node-pty" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
-(cp -fr "${package_dir}/node_modules_tmp/node_modules/node-pty" "${package_dir}/node_modules_tmp/node_modules/node-pty-node")
-rm -rf "${package_dir}/node_modules/node-pty" "${package_dir}/node_modules/node-pty-node"
-cp -fr "${package_dir}/node_modules_tmp/node_modules/node-pty" "${package_dir}/node_modules"
-(cp -fr "${package_dir}/node_modules/node-pty" "${package_dir}/node_modules/node-pty-node")
+notice "rebuild node-pty"
+cd "$package_dir/node_modules_tmp/node_modules" && \
+cp -fr "node-pty" "node-pty-node" && \
+cd "node-pty" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
 
-cd "$package_dir/node_modules_tmp/node_modules/native-watchdog" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
-rm -rf "${package_dir}/node_modules/native-watchdog" && cp -fr "${package_dir}/node_modules_tmp/node_modules/native-watchdog" "${package_dir}/node_modules"
+notice "rebuild native-watchdog"
+cd "$package_dir/node_modules_tmp/node_modules/native-watchdog" && \
+nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
 
 cd "${package_dir}/node_modules_tmp/node_modules/nodegit" && rm -rf .github include src lifecycleScripts vendor utils build/vendor build/Release/.deps
 cp -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" "${package_dir}/node_modules"
 
-(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/spdlog" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
+notice "rebuild oniguruma"
+cd "${package_dir}/node_modules_tmp/node_modules" && \
+cp -fr "oniguruma" "oniguruma-node" && \
+cd "oniguruma" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
+
+notice "rebuild spdlog"
+cd "${package_dir}/node_modules_tmp/node_modules" && \
+cp -fr "spdlog" "spdlog-node" && \
+cd "spdlog" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
 
-(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/{})
+notice "remove unused files"
+(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/@vscode/ripgrep" && \
-sed -i 's/api.github.com/wechat-devtools.jiyecafe.workers.dev/' lib/download.js && \
-sed -i "s/ const release/ downloadOpts.headers.upstream = 'api.github.com';const release/" lib/download.js && \
-sed -i "s/ return download/ opts.headers.upstream = 'objects.githubusercontent.com';return download/" lib/download.js && \
-sed -i 's/response.headers.location,/response.headers.location.replace("objects.githubusercontent.com", "wechat-devtools.jiyecafe.workers.dev"),/' lib/download.js && \
-npm run postinstall
-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"
+notice "copy node files"
+(cd "${package_dir}/node_modules_tmp/node_modules" && \
+find -name "*.node" | xargs -I{} \cp -rf {} ${package_dir}/node_modules/{})
 
-(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"
diff --git a/wechat-devtools-cli b/wechat-devtools-cli
index 99cea8f98f99..bb52a4c8af63 100644
--- a/wechat-devtools-cli
+++ b/wechat-devtools-cli
@@ -12,8 +12,6 @@ cd $root_dir
 
 export WECHAT_DEVTOOLS_DIR="$root_dir/nwjs"
 export APPDATA="$root_dir/nwjs"
-export PATH="$root_dir/wine:$root_dir/node/bin:$root_dir/nwjs:$PATH"
+export PATH="$root_dir/node/bin:$root_dir/nwjs:$PATH"
 
-# node $root_dir/package.nw/js/common/cli/index.js "$@"
-# const t=e.customScriptName?e.$0:o.basename(e.$0),
-echo "process.argv[1]='$root_dir/bin/wechat-devtools-cli';require('$root_dir/package.nw/js/common/cli/index.js')" | node - "$@"
+node $root_dir/package.nw/js/common/cli/index.js "$@"