update: devtools to v2.01.2510250

Author: msojocs

CHANGELOG.MD

@@ -1,5 +1,6 @@
-# 1.06.2504060-2 / 2025-11-
+# 2.01.2510250-1 / 2025-11-
 - feat: skyline support
+- update: devtools to v2.01.2510250
 
 # 1.06.2504060-1 / 2025-10-30
 - update: devtools to v1.06.2504060

conf/compiler_version

@@ -1 +1 @@
-WX_COMPILER_VERSION=v0.1.5
+WX_COMPILER_VERSION=v0.1.6

conf/devtools_v

@@ -1 +1 @@
-1.06.2504060,88b71e465a9750fa64acef13ffd6cb8d
+2.01.2510250,911c5c5d371f71fc37c19ae9cbcff9b6

docker/Dockerfile

@@ -8,9 +8,13 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
     sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \
     mkdir -p /build_temp/python36 /build_temp/nodejs && \
     apt update  && \
-    apt install -y binutils software-properties-common gcc g++ \
+    apt install -y binutils software-properties-common \
     gconf2 libxkbfile-dev p7zip-full make libssh2-1-dev libkrb5-dev wget curl \
     openssl pkg-config build-essential && \
+    add-apt-repository ppa:ubuntu-toolchain-r/test && \
+    apt update && \
+    apt install -y gcc-9 g++-9 && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 90 --slave /usr/bin/g++ g++ /usr/bin/g++-9 && \
     cd /build_temp/python36 && \
     apt-get install -y aptitude &&\
     aptitude -y install gcc make zlib1g-dev libffi-dev libssl-dev &&\

test/update-wcc

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+root_dir=$(cd `dirname $0`/.. && pwd -P)
+cp $HOME/github/wx-compiler/build/wcc $root_dir/package.nw/node_modules/wcc-exec/wcc

test/wine-wcc

@@ -7,5 +7,5 @@ docker run --rm -i \
     -e "ACTION_MODE=${ACTION_MODE:-false}" \
     -w /workspace \
     -v "$root_dir:/workspace" \
-    jiyecafe/wechat-devtools-build:v1.0.4 \
+    msojocs/wechat-devtools-build:v1.0.5 \
     bash ./tools/setup-wechat-devtools.sh

tools/build-with-docker.sh

@@ -6,37 +6,30 @@ tmp_dir="$root_dir/tmp"
 nwjs_dir="$root_dir/nwjs"
 package_dir="$root_dir/package.nw"
 
-# 修复: webview manager
-# 此bug导致以下功能异常: 
-# 1. 代码依赖分析不可用
-# 2. 拓展中的“SERVICE MARKET RECOMMENDS”功能不可用
-echo "fix: webview manager"
-sed -i 's#module.exports = createWebviewManager;#module.exports = createWebviewManager,( /** @type {any} */ (window)).createWebviewManager = createWebviewManager;#g' "$package_dir/js/libs/vseditor/webview-resource/main.js"
-
 echo "replace: wcc,wcsc linux version"
 source "${srcdir}/conf/compiler_version"
 
 mkdir -p "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}"
 if [ ! -f "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc" ];then
-  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcc" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc.tmp"
+  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcc-x86_64" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc.tmp"
   mv "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc.tmp" "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc"
   chmod 0755 "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc"
 fi
 
 if [ ! -f "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc" ];then
-  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcsc" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc.tmp"
+  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcsc-x86_64" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc.tmp"
   mv "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc.tmp" "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc"
   chmod 0755 "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc"
 fi
 
 if [ ! -f "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc_module.node" ];then
-  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcc_module.node" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc_module.node.tmp"
+  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcc-x86_64.node" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc_module.node.tmp"
   mv "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc_module.node.tmp" "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc_module.node"
   chmod 0755 "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcc_module.node"
 fi
 
 if [ ! -f "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc_module.node" ];then
-  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcsc_module.node" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc_module.node.tmp"
+  wget -c "https://github.com/msojocs/wx-compiler/releases/download/${WX_COMPILER_VERSION}/wcsc-x86_64.node" -O "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc_module.node.tmp"
   mv "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc_module.node.tmp" "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc_module.node"
   chmod 0755 "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc_module.node"
 fi
@@ -74,6 +67,14 @@ rm "${package_dir}/node_modules/node-float-pigment-css/float-pigment-css-for-nod
 cp "${srcdir}/cache/float-pigment-${float_pigment_version}.node" "${package_dir}/node_modules/node-float-pigment-css/float-pigment-css-for-nodejs.node"
 cp "${srcdir}/cache/float-pigment-${float_pigment_version}.node" "${package_dir}/node_modules/node-float-pigment-css/float-pigment-css-for-nwjs.node"
 
+# websocket找不到
+cd "${package_dir}/js/libs/vseditor/extensions/node_modules/ws/lib"
+mv "WebSocket.js" "websocket.js"
+mv "Receiver.js" "receiver.js"
+mv "Sender.js" "sender.js"
+mv "Constants.js" "constants.js"
+mv "Validation.js" "validation.js"
+
 # 阻止无限启动服务器
 mv "${package_dir}/js/core/entrance.js" "${package_dir}/js/core/entrance.js.bak"
 cat "${srcdir}/res/scripts/entrance.js" > "${package_dir}/js/core/entrance.js"

tools/fix-other.sh

@@ -95,6 +95,7 @@ export JOBS=$max_thread
     trash \
     vscode-oniguruma \
     nodegit \
+    @vscode/sqlite3 \
     --registry=https://registry.npmmirror.com \
     --nodegit_binary_host_mirror=https://npmmirror.com/mirrors/nodegit/v0.27.0/ ) # reinstall modules
 
@@ -123,6 +124,8 @@ cd "oniguruma" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=ht
 notice "rebuild spdlog"
 cd "${package_dir}/node_modules_tmp/node_modules" && \
 cp -fr "spdlog" "spdlog-node" && \
+mkdir -p "@vscode" && \
+cp -fr "spdlog" "@vscode/spdlog18" && \
 cd "spdlog" && nw-gyp rebuild --arch=x64 "--target=$NW_VERSION" --dist-url=https://registry.npmmirror.com/-/binary/nwjs
 
 notice "remove unused files"

tools/rebuild-node-modules.sh

@@ -92,6 +92,7 @@ const upgrade = function (extractPath) {
         if (fs.existsSync(path.resolve(__dirname, "../node/bin/node"))) {
             execSync(`cd ${path.resolve(__dirname, "../nwjs")} && ln -sr ../node/bin/node node`)
             execSync(`cd ${path.resolve(__dirname, "../nwjs")} && ln -s node node.exe`)
+            execSync(`cd ${path.resolve(__dirname, "../nwjs")} && ln -s node node-18.exe`)
         }
         if (fs.existsSync(path.resolve(__dirname, "../package.nw"))) {
             execSync(`cd ${path.resolve(__dirname, "../nwjs")} && ln -sr ../package.nw package.nw`)