diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 40f4a66..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "compiler"] - path = compiler - url = https://github.com/msojocs/wx-compiler diff --git a/changelog.md b/changelog.md index 77569b9..d6fe21c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,8 @@ +# 1.06.2405020-1 / 2024-07-07 + +- update: devtools to v1.06.2405020 +- update: compiler(Linux) v0.0.9 + # 1.06.2402040-1 / 2024-05-03 - update: devtools to v1.06.2402040 diff --git a/compiler b/compiler deleted file mode 160000 index a780f23..0000000 --- a/compiler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a780f231d31025a37667a70f82d8cde0cec8836d diff --git a/conf/compiler_version b/conf/compiler_version index e4ae77b..7f5a0d3 100644 --- a/conf/compiler_version +++ b/conf/compiler_version @@ -1 +1 @@ -WX_COMPILER_VERSION=v0.0.7 \ No newline at end of file +WX_COMPILER_VERSION=v0.0.9 \ No newline at end of file diff --git a/conf/devtools_v b/conf/devtools_v index 8f9884c..b5b7895 100644 --- a/conf/devtools_v +++ b/conf/devtools_v @@ -1 +1 @@ -1.06.2402040,5cc133b4d786413692b94fb85bb8a9de \ No newline at end of file +1.06.2405020,c907e68606fc731aebd0398ceaae4ac4 \ No newline at end of file diff --git a/tools/fix-other.sh b/tools/fix-other.sh index 55daa29..1a85a90 100755 --- a/tools/fix-other.sh +++ b/tools/fix-other.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex root_dir=$(cd `dirname $0`/.. && pwd -P) srcdir=$root_dir tmp_dir="$root_dir/tmp" @@ -28,22 +28,29 @@ if [ ! -f "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}/wcsc" ];then 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" + 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" + 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 + # \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js" -\cp "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}"/* "${package_dir}/node_modules/wcc-exec" +\cp "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}"/{wcc,wcsc} "${package_dir}/node_modules/wcc-exec" cd "${package_dir}/node_modules/wcc-exec" && chmod 0755 wcc wcsc && rm -rf wcc.exe wcsc.exe # node "${package_dir}/js/vendor/generatemd5.js" # 修复:可视化用的wcc,wcsc echo "fix: wcc,wcsc" -# wcc wcsc -ls -l "${srcdir}/compiler" -cd "${srcdir}/compiler" && npm install -# 可视化编译 -(cd "${package_dir}/node_modules/" \ -&& rm -rf wcc \ -&& cp -rL "${srcdir}/compiler/wcc_node" "wcc" \ -&& chmod +x wcc/bin/linux/* -) +\cp "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}"/wcc_module.node "${package_dir}/node_modules/wcc/build/Release" +cd "${package_dir}/node_modules/wcc/build/Release" && rm -rf wcc.node && mv wcc_module.node wcc.node +\cp "${srcdir}/cache/compiler/${WX_COMPILER_VERSION}"/wcsc_module.node "${package_dir}/node_modules/wcc/build/Release" +cd "${package_dir}/node_modules/wcc/build/Release" && rm -rf wcsc.node && mv wcsc_module.node wcsc.node current=`date "+%Y-%m-%d %H:%M:%S"` timeStamp=`date -d "$current" +%s`