fix: 可视化构建

1 files changed, 5 insertions, 14 deletions

diff --git a/fix-other.sh b/fix-other.sh
index 0d093967ac38..56294658a2d2 100755
--- a/fix-other.sh
+++ b/fix-other.sh
@@ -14,29 +14,20 @@ sed -i 's#module.exports = createWebviewManager;#module.exports = createWebviewM
 
 # 修复：可视化用的wcc,wcsc
 echo "fix: wcc,wcsc"
-if [[ ! -d "$tmp_dir/node_modules" ]];then
-  mkdir -p "$tmp_dir/node_modules"
-fi
-cd $tmp_dir && npm install miniprogram-compiler
 # wcc wcsc
+ls -l "${srcdir}/compiler"
 # 可视化编译
 (cd "${package_dir}/node_modules/" \
-&& rm -rf wcc wcsc \
-&& mkdir -p "wcc/bin/linux" \
-&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcc" "wcc/bin/linux/wcc" \
-&& cp -r "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcsc" "wcc/bin/linux/wcsc" \
-&& chmod 0755 "wcc/bin/linux/wcc" "wcc/bin/linux/wcsc" \
-&& cp -r "${srcdir}/compiler/wcc_node"/* "wcc" 
+&& rm -rf wcc \
+&& cp -rL "${srcdir}/compiler/wcc_node" "wcc" \
+&& chmod +x wcc/bin/linux/*
 )
 
 # 预览编译，设置NO_WINE=true环境变量生效
 # 如果是mac执行wcc,否则wcc.exe
 if [[ $NO_WINE == 'true' ]];then
   \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js"
-  \cp -rf "${srcdir}/compiler/nodejs/wcc" "${package_dir}/js/vendor/wcc"
-  \cp -rf "${srcdir}/compiler/nodejs/wcsc" "${package_dir}/js/vendor/wcsc"
-  \cp -rf "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcc" "${package_dir}/js/vendor/wcc.bin"
-  \cp -rf "${tmp_dir}/node_modules/miniprogram-compiler/bin/linux/wcsc" "${package_dir}/js/vendor/wcsc.bin"
+  \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/js/vendor"
   cd "${package_dir}/js/vendor" && chmod 0755 wcc wcsc wcc.bin wcsc.bin
   node "${package_dir}/js/vendor/generatemd5.js"