diff --git a/docker/Dockerfile b/docker/Dockerfile index 06b8f65..dd29ff5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,4 +30,16 @@ RUN apt remove -y p7zip p7zip-full p7zip-rar &&\ wget https://www.7-zip.org/a/7z2107-linux-x64.tar.xz && \ tar -xJf 7z2107-linux-x64.tar.xz && \ ln -s 7zz 7z -ENV PATH=/opt/7z:$PATH \ No newline at end of file +ENV PATH=/opt/7z:$PATH + +# ENV PATH=/opt/7z:/usr/local/openssl/bin:$PATH +# ENV export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/openssl/lib +# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/openssl/lib +# RUN apt install build-essential checkinstall zlib1g-dev -y && \ +# mkdir openssl && cd openssl && \ +# wget https://www.openssl.org/source/openssl-3.0.0.tar.gz --no-check-certificate && \ +# tar -xf openssl-3.0.0.tar.gz && \ +# cd openssl-3.0.0 && \ +# ./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl shared zlib && \ +# make -j$(nproc) && make install && \ +# echo '/usr/local/openssl/lib64' > /etc/ld.so.conf.d/openssl.conf && ldconfig \ No newline at end of file diff --git a/docker/entrypoint b/docker/entrypoint index 4b5df63..2120a3d 100755 --- a/docker/entrypoint +++ b/docker/entrypoint @@ -24,6 +24,14 @@ python --version echo "docker node version: $( node --version )" cd /workspace +# export C_INCLUDE_PATH=/usr/local/openssl/include:$C_INCLUDE_PATH +# export CPLUS_INCLUDE_PATH=/usr/local/openssl/include:$CPLUS_INCLUDE_PATH +# export LIBRARY_PATH=/usr/local/openssl/lib64:$LIBRARY_PATH +# export LD_LIBRARY_PATH=/usr/local/openssl/lib64:$LD_LIBRARY_PATH +# export PATH=/opt/7z:/usr/local/openssl/bin:$PATH +# ls -l /usr/local/openssl/lib64 +# openssl version -a + # # exec ./tools/rebuild-node-modules 0.53.1 ./tools/setup-wechat-devtools-bash diff --git a/docs/nwjs.md b/docs/nwjs.md index af033c3..f43ee80 100644 --- a/docs/nwjs.md +++ b/docs/nwjs.md @@ -1,20 +1,26 @@ -| 版本 | 备注 | -|-----|------| -| 0.55.0 | 选择文件夹的cancel事件不会被触发 | -| 0.56.0 | 选择文件夹的cancel事件不会被触发 | -| 0.56.1 | 选择文件夹的cancel事件不会被触发 | -| 0.57.0 | 选择文件夹的cancel事件不会被触发 | -| 0.57.1 | 选择文件夹的cancel事件不会被触发 | -| 0.58.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.59.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.59.1 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.60.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.61.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.62.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.62.1 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.70.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.75.0 | 无法启动,选择文件夹的cancel事件不会被触发 | -| 0.76.0 | 无法启动 | -| 0.77.0 | 无法启动 | -| 0.80.0 | 无法启动 | -| 0.82.0 | 无法启动 | \ No newline at end of file +| 版本 | node | nodegit | 文件夹的cancel事件 | 调试器WebSocket | +|-----|------|------|-------------|---------------| +| 0.55.0 | v16.4.2 | OK | 选择文件夹的cancel事件不会被触发 | | +| 0.56.0 | v16.4.2 | | 选择文件夹的cancel事件不会被触发 | | +| 0.56.1 | v16.9.1 | | 选择文件夹的cancel事件不会被触发 | | +| 0.57.0 | v16.9.1 | OK | 选择文件夹的cancel事件不会被触发 | OK | +| 0.57.1 | v16.10.0 | OK | 选择文件夹的cancel事件不会被触发 | OK | +| 0.58.0 | v16.10.0 | OK | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.59.0 | v17.1.0 | ERROR | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.59.1 | | | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.60.0 | v17.3.0 | 构建失败 | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.61.0 | | | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.62.0 | | | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.62.1 | | | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.64.1 | v18.0.0 | Error | | | +| 0.65.0 | v18.0.0 | 构建失败 | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.65.1 | v18.3.0 | OK | | ERROR| +| 0.66.1 | v18.5.0 | OK | | Error | +| 0.69.1 | v18.10.0 | OK | | error | +| 0.70.0 | v18.10.0 | OK | 无法启动,选择文件夹的cancel事件不会被触发 | ERROR | +| 0.75.0 | | | 无法启动,选择文件夹的cancel事件不会被触发 | | +| 0.76.0 | | | 无法启动 | ERROR | +| 0.77.0 | | | 无法启动 | | +| 0.80.0 | | | 无法启动 | | +| 0.81.0 | v20.7.0 | OK | | Error | +| 0.82.0 | | | 无法启动 | | \ No newline at end of file diff --git a/test/core-test b/test/core-test index f02ca72..83b7941 100755 --- a/test/core-test +++ b/test/core-test @@ -13,5 +13,8 @@ else node tools/wxvpkg_pack.js package.nw/core.wxvpkg.ext package.nw/core.wxvpkg rm -rf ~/.config/wechat-devtools/WeappCache rm -rf ~/.config/wechat-devtools/WeappVendor + unset https_proxy + unset http_proxy + unset all_proxy bin/wechat-devtools fi \ No newline at end of file diff --git a/tools/rebuild-node-modules.sh b/tools/rebuild-node-modules.sh index 8116bab..81cccdb 100755 --- a/tools/rebuild-node-modules.sh +++ b/tools/rebuild-node-modules.sh @@ -82,9 +82,13 @@ 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/node_modules" -notice "install modules" max_thread=$(cat /proc/cpuinfo| grep "processor"| wc -l) export JOBS=$max_thread +notice "install nodegit" +(cd "${package_dir}/node_modules_tmp" && npm install \ + nodegit@next \ + --registry=https://registry.npmmirror.com ) # reinstall modules +notice "install modules" (cd "${package_dir}/node_modules_tmp" && npm install \ extract-file-icon \ native-keymap \ @@ -95,11 +99,6 @@ export JOBS=$max_thread trash \ vscode-oniguruma ) -notice "install nodegit" -(cd "${package_dir}/node_modules_tmp" && npm install \ - nodegit \ - --registry=https://registry.npmmirror.com \ - --nodegit_binary_host_mirror=https://npmmirror.com/mirrors/nodegit/v0.27.0/ ) # reinstall modules # rebuild notice "rebuild node-pty"