From 4744ec978d812a1aebfa4ffc77666b9cc4510726 Mon Sep 17 00:00:00 2001 From: msojocs Date: Wed, 23 Feb 2022 22:09:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20debugWXS=20=E5=8E=BB=E9=99=A4=E5=AF=B9?= =?UTF-8?q?=E4=BA=8Ewine=E7=9A=84=E4=BE=9D=E8=B5=96=20#13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- bin/wechat-devtools | 36 +++++------ compiler/nodejs/wcc | 19 +++--- compiler/wcc_node/index.js | 3 +- compiler/wcc_node/src/wcc.js | 3 +- test/linkDir | 9 --- test/wcc/lla1.sh | 13 +++- test/wcc/lla2.sh | 13 +++- test/wcc/llw1.sh | 13 +++- test/wcc/llw2.sh | 13 +++- tools/rebuild-node-modules2 | 111 ---------------------------------- 11 files changed, 69 insertions(+), 166 deletions(-) delete mode 100644 test/linkDir delete mode 100644 tools/rebuild-node-modules2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f71e5ae..b314ef6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: run: | sudo chmod -R 777 package.nw node ls -l - sudo rm -rf cache tmp .git + sudo rm -rf cache tmp .git test mkdir ${{ env. name }} sudo find -maxdepth 1 -not -name ${{ env.name }} -not -name . -exec mv {} ${{ env.name }} \; sudo cp -r "${{ env.name }}/package.nw/node_modules/nodegit" nodegit diff --git a/bin/wechat-devtools b/bin/wechat-devtools index d49bc96..a7bed68 100755 --- a/bin/wechat-devtools +++ b/bin/wechat-devtools @@ -7,29 +7,23 @@ export APPDATA="$( echo ~ )/.config/wechat_devtools" export PATH="$root_dir/wine:$root_dir/node/bin:$root_dir/nwjs:$PATH" export USERPROFILE=$( echo ~ ) -current=`date "+%Y-%m-%d %H:%M:%S"` -timeStamp=`date -d "$current" +%s` +clean_cache() { + echo "清理缓存"; + rm -rf "$APPDATA/WeappCache"; + rm -rf "$APPDATA/WeappVendor"; +} -# 获取首次运行时间 -if [[ -f "$APPDATA/.run_time" ]];then - run_time=`cat "$APPDATA/.run_time"` +# 检测是否有清除缓存的必要 +if [[ -f "$APPDATA/.build_time" ]];then + diff "$APPDATA/.build_time" "$root_dir/package.nw/.build_time" >/dev/null; + if [ ! "$?" == "0" ];then + \cp -f "$root_dir/package.nw/.build_time" "$APPDATA/.build_time"; + clean_cache; + fi; else - run_time=0 -fi - -# 获取构建时间 -if [[ -f "$root_dir/package.nw/.build_time" ]];then - build_time=`cat "$root_dir/package.nw/.build_time"` -else - build_time=timeStamp -fi - -if [[ ! $build_time < $run_time ]];then - echo "清理缓存" - echo $timeStamp > "$APPDATA/.run_time" - rm -rf "$APPDATA/WeappCache" - rm -rf "$APPDATA/WeappVendor" -fi + \cp -f "$root_dir/package.nw/.build_time" "$APPDATA/.build_time"; + clean_cache; +fi; EXTENSION1="--load-extension=$root_dir/nwjs/package.nw/js/ideplugin" EXTENSION2=--load-extension=~/.config/wechat_devtools/WeappPlugin diff --git a/compiler/nodejs/wcc b/compiler/nodejs/wcc index 22ce317..74a5d5f 100644 --- a/compiler/nodejs/wcc +++ b/compiler/nodejs/wcc @@ -4,7 +4,8 @@ const version = "20220222" const path = require("path"); const args = process.argv.slice(2); const funcName = args[args.indexOf('-gn') + 1] -const wccPath = path.resolve(__dirname, './wcc.bin') +const debugWXS = args.includes('-ds') +const wccPath = path.resolve(__dirname, '../wcc') function genFunctionContent_LLW(wxmlName, config={}, source) { // 起始 let content = `var cs = cs || [];\u000a${config.funcName}` + "=function(_,_v,_n,_p,_s,_wp,_wl,$gwn,$gwl,$gwh,wh,$gstack,$gwrt,gra,grb,TestTest,wfor,_ca,_da,_r,_rz,_o,_oz,_1,_1z,_2,_2z,_m,_mz,nv_getDate,nv_getRegExp,nv_console,nv_parseInt,nv_parseFloat,nv_isNaN,nv_isFinite,nv_decodeURI,nv_decodeURIComponent,nv_encodeURI,nv_encodeURIComponent,$gdc,nv_JSON,_af,_gv,_ai,_grp,_gd,_gapi,$ixc,_ic,_w,_ev,_tsd){return function(path,global){\u000aif(typeof global==='undefined'){if (typeof __GWX_GLOBAL__==='undefined')global={};else global=__GWX_GLOBAL__;}if(typeof __WXML_GLOBAL__ === 'undefined') {__WXML_GLOBAL__={};\u000a}__WXML_GLOBAL__.modules = __WXML_GLOBAL__.modules || {};\u000a" @@ -20,10 +21,10 @@ function genFunctionContent_LLW(wxmlName, config={}, source) { const exp = `function gz\\${funcName}_${config.num+1}\\(\\)\\{[\\s\\S]*_WXML_GLOBAL__\\.ops_cached\\.\\${funcName}_${config.num+1}\n}` const gz = source.match(new RegExp(exp))[0] content += gz + // debug要作为判断依据，所以放前面 let debug = source.match(new RegExp(`\\n__WXML_GLOBAL__\\.ops_set\\.\\${funcName}=[\\s\\S]*?\\nvar`)) debug = debug[0].substring(0, debug[0].length-3).replace(new RegExp(`\\${funcName}`, 'g'), config.funcName) - content += debug content += `var x=['./${wxmlName}.wxml'];d_[x[0]]={}\u000a` @@ -65,11 +66,8 @@ function genFunctionContent_LLA(wxmlName, config={}, source) { content += "var cs = cs || [];" + cs[1].replace(new RegExp(`\\${funcName}`, 'g'), config.funcName) - // debug要作为判断依据，所以放前面 - let debug = source.match(new RegExp(`\\n__WXML_GLOBAL__\\.ops_set\\.\\${funcName}=[\\s\\S]*?\\nvar`)) - debug = debug[0].substring(0, debug[0].length-3).replace(new RegExp(`\\${funcName}`, 'g'), config.funcName) // gz函数 - if(!debug.includes('debuginfo_set')){ + if(!debugWXS){ const exp = `function gz\\${funcName}_${config.num+1}\\(\\)\\{[\\s\\S]*?\\)}` const gz = source.match(new RegExp(exp)) // console.log(gz) @@ -80,20 +78,23 @@ function genFunctionContent_LLA(wxmlName, config={}, source) { const gz = source.match(new RegExp(exp)) content += gz[0].replace(new RegExp(`\\${funcName}\\_\\d+`, 'g'), `${config.funcName}_1`) } + + // debug + let debug = source.match(new RegExp(`\\n__WXML_GLOBAL__\\.ops_set\\.\\${funcName}=[\\s\\S]*?\\nvar`)) + debug = debug[0].substring(0, debug[0].length-3).replace(new RegExp(`\\${funcName}`, 'g'), config.funcName) content += debug content += `var x=['./${wxmlName}.wxml'];d_[x[0]]={}\u000a` // m0 --- m{num} - if(!debug.includes('debuginfo_set')){ + if(!debugWXS){ content += `var m0=function(e,s,r,gg){\u000avar z=gz${config.funcName}_1()\u000areturn r\u000a}\u000ae_[x[0]]={f:m0,j:[],i:[],ti:[],ic:[]}` }else{ - //m0 -2 // m0 --- m{num} const m0Exp = `var m${config.num}=function\\(e,s,r,gg\\){[\\s\\S]*{f:m${config.num},j:\\[\\],i:\\[\\],ti:\\[\\],ic:\\[\\]}` const m0 = source.match(new RegExp(m0Exp))[0].replace(new RegExp(`m${config.num}`, 'g'), 'm0').replace(new RegExp(`x\\[${config.num}\\]`, 'g'), 'x[0]') content += m0.replace(new RegExp(`\\${funcName}\\_\\d+`, 'g'), `${config.funcName}_1`) -} + } content += `\u000aif(path&&e_[path]){\u000areturn function(env,dd,global){$gwxc=0;var root={\u0022tag\u0022:\u0022wx-page\u0022};root.children=[]\u000a;g=\u0022${config.funcName}\u0022;var main=e_[path].f\u000acs=[]\u000aif (typeof global===\u0022undefined\u0022)global={};global.f=$gdc(f_[path],\u0022\u0022,1);\u000atry{\u000amain(env,{},root,global);\u000a_tsd(root)\u000a}catch(err){\u000aconsole.log(cs, env);\u000aconsole.log(err)\u000athrow err\u000a}\u000a;g=\u0022\u0022;\u000areturn root;\u000a}\u000a}\u000a}\u000a}(__g.a,__g.b,__g.c,__g.d,__g.e,__g.f,__g.g,__g.h,__g.i,__g.j,__g.k,__g.l,__g.m,__g.n,__g.o,__g.p,__g.q,__g.r,__g.s,__g.t,__g.u,__g.v,__g.w,__g.x,__g.y,__g.z,__g.A,__g.B,__g.C,__g.D,__g.E,__g.F,__g.G,__g.H,__g.I,__g.J,__g.K,__g.L,__g.M,__g.N,__g.O,__g.P,__g.Q,__g.R,__g.S,__g.T,__g.U,__g.V,__g.W,__g.X,__g.Y,__g.Z,__g.aa);if(__vd_version_info__.delayedGwx||false)${config.funcName}();` // console.log(content) diff --git a/compiler/wcc_node/index.js b/compiler/wcc_node/index.js index 7a0b30f..0085896 100644 --- a/compiler/wcc_node/index.js +++ b/compiler/wcc_node/index.js @@ -57,7 +57,6 @@ exports = async function (options) { let result try { // console.warn('final options:', options); - // TODO: fix result = wcc(options.cwd, options.files, {cut: options.isCut}, options) // console.warn('wcc result', result) } catch(errmsg) { @@ -71,7 +70,7 @@ exports = async function (options) { const dir = path.dirname(output) if (lazyload) { // lazyload 为 true时，wcc 返回值是个对象, 需要序列化一下 - result = JSON.stringify(result) + // result = JSON.stringify(result) } try { await fs.stat(dir) diff --git a/compiler/wcc_node/src/wcc.js b/compiler/wcc_node/src/wcc.js index 435539b..2d5bb4b 100644 --- a/compiler/wcc_node/src/wcc.js +++ b/compiler/wcc_node/src/wcc.js @@ -96,7 +96,7 @@ function getAllFiles(rootPath, files) { * @param {*} files 文件列表，包含组件 * @param {*} param2 * @param {*} options 配置选项 - * @returns + * @returns string */ function wxmlToJS(rootPath, files, { cut } = {}, options={}) { const type = cut ? '-xc' : '-cc' @@ -108,7 +108,6 @@ function wxmlToJS(rootPath, files, { cut } = {}, options={}) { .concat(files) .concat(['-gn', '$gwx']) - // TODO:可用性检测 // wxs调试 if(options.debugWXS)args.unshift('-ds') // 懒加载 diff --git a/test/linkDir b/test/linkDir deleted file mode 100644 index 0e32a45..0000000 --- a/test/linkDir +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env node -const path = require("path") -const fs = require("fs") - -fs.symlinkSync( - path.resolve(__dirname, "../package.nw"), - path.resolve(__dirname, "../nwjs/package.nw") - -) \ No newline at end of file diff --git a/test/wcc/lla1.sh b/test/wcc/lla1.sh index 96a11d0..9a6b086 100644 --- a/test/wcc/lla1.sh +++ b/test/wcc/lla1.sh @@ -3,11 +3,18 @@ root_dir=$(cd `dirname $0`/../.. && pwd -P) pkg_dir="/mnt/disk1/Project/WeCuit-Project/WeCuit-Mini-uni-test_uni_vue-cli/dist/build/mp-weixin" pkg_dir="/home/msojocs/Documents/we1" - +store_dir="$root_dir/test/wcc/lla/1" cd "$pkg_dir" && \ -wine "$root_dir/package.nw/js/vendor/wcc.exe" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-lla" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$root_dir/test/wcc/lla/1/wine.json" +wine "$root_dir/package.nw/js/vendor/wcc.exe" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-lla" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$store_dir/wine.json" echo "===================" cd "$pkg_dir" && \ -"$root_dir/compiler/nodejs/wcc" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-lla" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$root_dir/test/wcc/lla/1/nodejs.json" \ No newline at end of file +"$root_dir/compiler/nodejs/wcc" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-lla" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$store_dir/nodejs.json" + +diff "$store_dir/wine.json" "$store_dir/nodejs.json" >/dev/null +if [ "$?" == "0" ];then + echo "the file or dir is same!" +else + echo "the file or dir is different!" +fi \ No newline at end of file diff --git a/test/wcc/lla2.sh b/test/wcc/lla2.sh index ad327a1..9e68051 100644 --- a/test/wcc/lla2.sh +++ b/test/wcc/lla2.sh @@ -3,14 +3,21 @@ root_dir=$(cd `dirname $0`/../.. && pwd -P) pkg_dir="/mnt/disk1/Project/WeCuit-Project/WeCuit-Mini-uni-test_uni_vue-cli/dist/dev/mp-weixin" # pkg_dir="/home/msojocs/Documents/we1" - +store_dir="$root_dir/test/wcc/lla/2" cd "$pkg_dir" && \ wine "$root_dir/package.nw/js/vendor/wcc.exe" "-ds" "-d" "--split" ">_<9986" "-xc" "56>_<9986./components/card.wxml>_<99860>_<9986./components/beat-char/beat-char.wxml>_<99860>_<9986./components/mytree/mytree.wxml>_<99861>_<9986mytree>_<9986./components/scroll/index.wxml>_<99860>_<9986./components/tab/index.wxml>_<99860>_<9986./miniprogram_npm/weui-miniprogram/cell/cell.wxml>_<99861>_<9986mp-cells>_<9986./miniprogram_npm/weui-miniprogram/cells/cells.wxml>_<99860>_<9986./miniprogram_npm/weui-miniprogram/loading/loading.wxml>_<99860>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml>_<99861>_<9986node>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml>_<99861>_<9986node>_<9986./pages/THEOL/THEOL.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/THEOL/dir/dir.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/THEOL/tree/tree.wxml>_<99862>_<9986mytree>_<9986mp-loading>_<9986./pages/articleView/articleView.wxml>_<99861>_<9986html-parser>_<9986./pages/auth/auth.wxml>_<99863>_<9986uni-row>_<9986uni-col>_<9986uni-title>_<9986./pages/calendar/calendar.wxml>_<99860>_<9986./pages/card/card.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/checkIn/edit.wxml>_<99863>_<9986d-form>_<9986mp-cell>_<9986mp-cells>_<9986./pages/checkIn/list.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/courseTable/courseTable.wxml>_<99860>_<9986./pages/courseTable/imgCropper/imgCropper.wxml>_<99861>_<9986image-cropper>_<9986./pages/exam/exam.wxml>_<99860>_<9986./pages/grade/grade.wxml>_<99860>_<9986./pages/index/index.wxml>_<99860>_<9986./pages/laboratory/detail.wxml>_<99860>_<9986./pages/laboratory/list.wxml>_<99860>_<9986./pages/login/login.wxml>_<99860>_<9986./pages/maintenance/maintenance.wxml>_<99861>_<9986beat-char>_<9986./pages/my/about.wxml>_<99860>_<9986./pages/my/info.wxml>_<99862>_<9986uni-row>_<9986uni-col>_<9986./pages/my/my.wxml>_<99862>_<9986uni-card>_<9986info>_<9986./pages/my/ADMag/ADMag.wxml>_<99860>_<9986./pages/my/ADMag/watchAD/watchAD.wxml>_<99860>_<9986./pages/my/bind/bind.wxml>_<99860>_<9986./pages/my/bind/mini.wxml>_<99860>_<9986./pages/my/dataMag/dataMag.wxml>_<99860>_<9986./pages/my/register/register.wxml>_<99860>_<9986./pages/my/sso/forget.wxml>_<99860>_<9986./pages/my/sso/sso.wxml>_<99862>_<9986mp-cells>_<9986mp-cell>_<9986./pages/my/sub/sub.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/newsList/newsList.wxml>_<99862>_<9986tab>_<9986scroll>_<9986./pages/officeGrade/query.wxml>_<99862>_<9986mp-cells>_<9986mp-cell>_<9986./pages/resources/list.wxml>_<99860>_<9986./pages/terms/privacy.wxml>_<99861>_<9986card>_<9986./pages/terms/terms.wxml>_<99860>_<9986./uni_modules/uni-card/components/uni-card/uni-card.wxml>_<99861>_<9986uni-icons>_<9986./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml>_<99860>_<9986./uni_modules/uni-row/components/uni-col/uni-col.wxml>_<99860>_<9986./uni_modules/uni-row/components/uni-row/uni-row.wxml>_<99860>_<9986./uni_modules/uni-title/components/uni-title/uni-title.wxml>_<99860>_<9986./wxcomponents/dynamicForm/index.wxml>_<99863>_<9986van-icon>_<9986van-uploader>_<9986time-picker>_<9986./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml>_<99860>_<9986./wxcomponents/dynamicForm/vant/icon/index.wxml>_<99861>_<9986van-info>_<9986./wxcomponents/dynamicForm/vant/info/index.wxml>_<99860>_<9986./wxcomponents/dynamicForm/vant/uploader/index.wxml>_<99861>_<9986van-icon>_<9986./wxcomponents/image-cropper/image-cropper.wxml>_<99860" "-lla" "./components/card>_<9986./components/beat-char/beat-char>_<9986./components/mytree/mytree>_<9986./components/scroll/index>_<9986./components/tab/index>_<9986./miniprogram_npm/weui-miniprogram/cell/cell>_<9986./miniprogram_npm/weui-miniprogram/cells/cells>_<9986./miniprogram_npm/weui-miniprogram/loading/loading>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/node/node>_<9986./pages/THEOL/THEOL>_<9986./pages/THEOL/dir/dir>_<9986./pages/THEOL/tree/tree>_<9986./pages/articleView/articleView>_<9986./pages/auth/auth>_<9986./pages/calendar/calendar>_<9986./pages/card/card>_<9986./pages/checkIn/edit>_<9986./pages/checkIn/list>_<9986./pages/courseTable/courseTable>_<9986./pages/courseTable/imgCropper/imgCropper>_<9986./pages/exam/exam>_<9986./pages/grade/grade>_<9986./pages/index/index>_<9986./pages/laboratory/detail>_<9986./pages/laboratory/list>_<9986./pages/login/login>_<9986./pages/maintenance/maintenance>_<9986./pages/my/about>_<9986./pages/my/info>_<9986./pages/my/my>_<9986./pages/my/ADMag/ADMag>_<9986./pages/my/ADMag/watchAD/watchAD>_<9986./pages/my/bind/bind>_<9986./pages/my/bind/mini>_<9986./pages/my/dataMag/dataMag>_<9986./pages/my/register/register>_<9986./pages/my/sso/forget>_<9986./pages/my/sso/sso>_<9986./pages/my/sub/sub>_<9986./pages/newsList/newsList>_<9986./pages/officeGrade/query>_<9986./pages/resources/list>_<9986./pages/terms/privacy>_<9986./pages/terms/terms>_<9986./uni_modules/uni-card/components/uni-card/uni-card>_<9986./uni_modules/uni-icons/components/uni-icons/uni-icons>_<9986./uni_modules/uni-row/components/uni-col/uni-col>_<9986./uni_modules/uni-row/components/uni-row/uni-row>_<9986./uni_modules/uni-title/components/uni-title/uni-title>_<9986./wxcomponents/dynamicForm/index>_<9986./wxcomponents/dynamicForm/components/timePicker/timePicker>_<9986./wxcomponents/dynamicForm/vant/icon/index>_<9986./wxcomponents/dynamicForm/vant/info/index>_<9986./wxcomponents/dynamicForm/vant/uploader/index>_<9986./wxcomponents/image-cropper/image-cropper" "./components/card.wxml" "./components/beat-char/beat-char.wxml" "./components/mytree/mytree.wxml" "./components/scroll/index.wxml" "./components/tab/index.wxml" "./miniprogram_npm/weui-miniprogram/cell/cell.wxml" "./miniprogram_npm/weui-miniprogram/cells/cells.wxml" "./miniprogram_npm/weui-miniprogram/loading/loading.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml" "./pages/THEOL/THEOL.wxml" "./pages/THEOL/dir/dir.wxml" "./pages/THEOL/tree/tree.wxml" "./pages/articleView/articleView.wxml" "./pages/auth/auth.wxml" "./pages/calendar/calendar.wxml" "./pages/card/card.wxml" "./pages/checkIn/edit.wxml" "./pages/checkIn/list.wxml" "./pages/courseTable/courseTable.wxml" "./pages/courseTable/imgCropper/imgCropper.wxml" "./pages/exam/exam.wxml" "./pages/grade/grade.wxml" "./pages/index/index.wxml" "./pages/laboratory/detail.wxml" "./pages/laboratory/list.wxml" "./pages/login/login.wxml" "./pages/maintenance/maintenance.wxml" "./pages/my/about.wxml" "./pages/my/info.wxml" "./pages/my/my.wxml" "./pages/my/ADMag/ADMag.wxml" "./pages/my/ADMag/watchAD/watchAD.wxml" "./pages/my/bind/bind.wxml" "./pages/my/bind/mini.wxml" "./pages/my/dataMag/dataMag.wxml" "./pages/my/register/register.wxml" "./pages/my/sso/forget.wxml" "./pages/my/sso/sso.wxml" "./pages/my/sub/sub.wxml" "./pages/newsList/newsList.wxml" "./pages/officeGrade/query.wxml" "./pages/resources/list.wxml" "./pages/terms/privacy.wxml" "./pages/terms/terms.wxml" "./uni_modules/uni-card/components/uni-card/uni-card.wxml" "./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml" "./uni_modules/uni-row/components/uni-col/uni-col.wxml" "./uni_modules/uni-row/components/uni-row/uni-row.wxml" "./uni_modules/uni-title/components/uni-title/uni-title.wxml" "./wxcomponents/dynamicForm/index.wxml" "./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml" "./wxcomponents/dynamicForm/vant/icon/index.wxml" "./wxcomponents/dynamicForm/vant/info/index.wxml" "./wxcomponents/dynamicForm/vant/uploader/index.wxml" "./wxcomponents/image-cropper/image-cropper.wxml" "./pages/grade/check.wxs" "./pages/laboratory/labDetail.wxs" "-gn" "\$gwx" \ - > "$root_dir/test/wcc/lla/2/wine.json" + > "$store_dir/wine.json" echo "===================" cd "$pkg_dir" && \ "$root_dir/compiler/nodejs/wcc" "-ds" "-d" "--split" ">_<9986" "-xc" "56>_<9986./components/card.wxml>_<99860>_<9986./components/beat-char/beat-char.wxml>_<99860>_<9986./components/mytree/mytree.wxml>_<99861>_<9986mytree>_<9986./components/scroll/index.wxml>_<99860>_<9986./components/tab/index.wxml>_<99860>_<9986./miniprogram_npm/weui-miniprogram/cell/cell.wxml>_<99861>_<9986mp-cells>_<9986./miniprogram_npm/weui-miniprogram/cells/cells.wxml>_<99860>_<9986./miniprogram_npm/weui-miniprogram/loading/loading.wxml>_<99860>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml>_<99861>_<9986node>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml>_<99861>_<9986node>_<9986./pages/THEOL/THEOL.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/THEOL/dir/dir.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/THEOL/tree/tree.wxml>_<99862>_<9986mytree>_<9986mp-loading>_<9986./pages/articleView/articleView.wxml>_<99861>_<9986html-parser>_<9986./pages/auth/auth.wxml>_<99863>_<9986uni-row>_<9986uni-col>_<9986uni-title>_<9986./pages/calendar/calendar.wxml>_<99860>_<9986./pages/card/card.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/checkIn/edit.wxml>_<99863>_<9986d-form>_<9986mp-cell>_<9986mp-cells>_<9986./pages/checkIn/list.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/courseTable/courseTable.wxml>_<99860>_<9986./pages/courseTable/imgCropper/imgCropper.wxml>_<99861>_<9986image-cropper>_<9986./pages/exam/exam.wxml>_<99860>_<9986./pages/grade/grade.wxml>_<99860>_<9986./pages/index/index.wxml>_<99860>_<9986./pages/laboratory/detail.wxml>_<99860>_<9986./pages/laboratory/list.wxml>_<99860>_<9986./pages/login/login.wxml>_<99860>_<9986./pages/maintenance/maintenance.wxml>_<99861>_<9986beat-char>_<9986./pages/my/about.wxml>_<99860>_<9986./pages/my/info.wxml>_<99862>_<9986uni-row>_<9986uni-col>_<9986./pages/my/my.wxml>_<99862>_<9986uni-card>_<9986info>_<9986./pages/my/ADMag/ADMag.wxml>_<99860>_<9986./pages/my/ADMag/watchAD/watchAD.wxml>_<99860>_<9986./pages/my/bind/bind.wxml>_<99860>_<9986./pages/my/bind/mini.wxml>_<99860>_<9986./pages/my/dataMag/dataMag.wxml>_<99860>_<9986./pages/my/register/register.wxml>_<99860>_<9986./pages/my/sso/forget.wxml>_<99860>_<9986./pages/my/sso/sso.wxml>_<99862>_<9986mp-cells>_<9986mp-cell>_<9986./pages/my/sub/sub.wxml>_<99862>_<9986mp-cell>_<9986mp-cells>_<9986./pages/newsList/newsList.wxml>_<99862>_<9986tab>_<9986scroll>_<9986./pages/officeGrade/query.wxml>_<99862>_<9986mp-cells>_<9986mp-cell>_<9986./pages/resources/list.wxml>_<99860>_<9986./pages/terms/privacy.wxml>_<99861>_<9986card>_<9986./pages/terms/terms.wxml>_<99860>_<9986./uni_modules/uni-card/components/uni-card/uni-card.wxml>_<99861>_<9986uni-icons>_<9986./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml>_<99860>_<9986./uni_modules/uni-row/components/uni-col/uni-col.wxml>_<99860>_<9986./uni_modules/uni-row/components/uni-row/uni-row.wxml>_<99860>_<9986./uni_modules/uni-title/components/uni-title/uni-title.wxml>_<99860>_<9986./wxcomponents/dynamicForm/index.wxml>_<99863>_<9986van-icon>_<9986van-uploader>_<9986time-picker>_<9986./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml>_<99860>_<9986./wxcomponents/dynamicForm/vant/icon/index.wxml>_<99861>_<9986van-info>_<9986./wxcomponents/dynamicForm/vant/info/index.wxml>_<99860>_<9986./wxcomponents/dynamicForm/vant/uploader/index.wxml>_<99861>_<9986van-icon>_<9986./wxcomponents/image-cropper/image-cropper.wxml>_<99860" "-lla" "./components/card>_<9986./components/beat-char/beat-char>_<9986./components/mytree/mytree>_<9986./components/scroll/index>_<9986./components/tab/index>_<9986./miniprogram_npm/weui-miniprogram/cell/cell>_<9986./miniprogram_npm/weui-miniprogram/cells/cells>_<9986./miniprogram_npm/weui-miniprogram/loading/loading>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html>_<9986./node-modules/mp-html/dist/uni-app/components/mp-html/node/node>_<9986./pages/THEOL/THEOL>_<9986./pages/THEOL/dir/dir>_<9986./pages/THEOL/tree/tree>_<9986./pages/articleView/articleView>_<9986./pages/auth/auth>_<9986./pages/calendar/calendar>_<9986./pages/card/card>_<9986./pages/checkIn/edit>_<9986./pages/checkIn/list>_<9986./pages/courseTable/courseTable>_<9986./pages/courseTable/imgCropper/imgCropper>_<9986./pages/exam/exam>_<9986./pages/grade/grade>_<9986./pages/index/index>_<9986./pages/laboratory/detail>_<9986./pages/laboratory/list>_<9986./pages/login/login>_<9986./pages/maintenance/maintenance>_<9986./pages/my/about>_<9986./pages/my/info>_<9986./pages/my/my>_<9986./pages/my/ADMag/ADMag>_<9986./pages/my/ADMag/watchAD/watchAD>_<9986./pages/my/bind/bind>_<9986./pages/my/bind/mini>_<9986./pages/my/dataMag/dataMag>_<9986./pages/my/register/register>_<9986./pages/my/sso/forget>_<9986./pages/my/sso/sso>_<9986./pages/my/sub/sub>_<9986./pages/newsList/newsList>_<9986./pages/officeGrade/query>_<9986./pages/resources/list>_<9986./pages/terms/privacy>_<9986./pages/terms/terms>_<9986./uni_modules/uni-card/components/uni-card/uni-card>_<9986./uni_modules/uni-icons/components/uni-icons/uni-icons>_<9986./uni_modules/uni-row/components/uni-col/uni-col>_<9986./uni_modules/uni-row/components/uni-row/uni-row>_<9986./uni_modules/uni-title/components/uni-title/uni-title>_<9986./wxcomponents/dynamicForm/index>_<9986./wxcomponents/dynamicForm/components/timePicker/timePicker>_<9986./wxcomponents/dynamicForm/vant/icon/index>_<9986./wxcomponents/dynamicForm/vant/info/index>_<9986./wxcomponents/dynamicForm/vant/uploader/index>_<9986./wxcomponents/image-cropper/image-cropper" "./components/card.wxml" "./components/beat-char/beat-char.wxml" "./components/mytree/mytree.wxml" "./components/scroll/index.wxml" "./components/tab/index.wxml" "./miniprogram_npm/weui-miniprogram/cell/cell.wxml" "./miniprogram_npm/weui-miniprogram/cells/cells.wxml" "./miniprogram_npm/weui-miniprogram/loading/loading.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml" "./pages/THEOL/THEOL.wxml" "./pages/THEOL/dir/dir.wxml" "./pages/THEOL/tree/tree.wxml" "./pages/articleView/articleView.wxml" "./pages/auth/auth.wxml" "./pages/calendar/calendar.wxml" "./pages/card/card.wxml" "./pages/checkIn/edit.wxml" "./pages/checkIn/list.wxml" "./pages/courseTable/courseTable.wxml" "./pages/courseTable/imgCropper/imgCropper.wxml" "./pages/exam/exam.wxml" "./pages/grade/grade.wxml" "./pages/index/index.wxml" "./pages/laboratory/detail.wxml" "./pages/laboratory/list.wxml" "./pages/login/login.wxml" "./pages/maintenance/maintenance.wxml" "./pages/my/about.wxml" "./pages/my/info.wxml" "./pages/my/my.wxml" "./pages/my/ADMag/ADMag.wxml" "./pages/my/ADMag/watchAD/watchAD.wxml" "./pages/my/bind/bind.wxml" "./pages/my/bind/mini.wxml" "./pages/my/dataMag/dataMag.wxml" "./pages/my/register/register.wxml" "./pages/my/sso/forget.wxml" "./pages/my/sso/sso.wxml" "./pages/my/sub/sub.wxml" "./pages/newsList/newsList.wxml" "./pages/officeGrade/query.wxml" "./pages/resources/list.wxml" "./pages/terms/privacy.wxml" "./pages/terms/terms.wxml" "./uni_modules/uni-card/components/uni-card/uni-card.wxml" "./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml" "./uni_modules/uni-row/components/uni-col/uni-col.wxml" "./uni_modules/uni-row/components/uni-row/uni-row.wxml" "./uni_modules/uni-title/components/uni-title/uni-title.wxml" "./wxcomponents/dynamicForm/index.wxml" "./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml" "./wxcomponents/dynamicForm/vant/icon/index.wxml" "./wxcomponents/dynamicForm/vant/info/index.wxml" "./wxcomponents/dynamicForm/vant/uploader/index.wxml" "./wxcomponents/image-cropper/image-cropper.wxml" "./pages/grade/check.wxs" "./pages/laboratory/labDetail.wxs" "-gn" "\$gwx" \ - > "$root_dir/test/wcc/lla/2/nodejs.json" \ No newline at end of file + > "$store_dir/nodejs.json" + +diff "$store_dir/wine.json" "$store_dir/nodejs.json" >/dev/null +if [ "$?" == "0" ];then + echo "the file or dir is same!" +else + echo "the file or dir is different!" +fi \ No newline at end of file diff --git a/test/wcc/llw1.sh b/test/wcc/llw1.sh index 5a02009..a634a7f 100644 --- a/test/wcc/llw1.sh +++ b/test/wcc/llw1.sh @@ -4,10 +4,19 @@ root_dir=$(cd `dirname $0`/../.. && pwd -P) pkg_dir="/mnt/disk1/Project/WeCuit-Project/WeCuit-Mini-uni-test_uni_vue-cli/dist/build/mp-weixin" pkg_dir="/home/msojocs/Documents/we1" +store_dir="$root_dir/test/wcc/llw/1" + cd "$pkg_dir" && \ -wine "$root_dir/package.nw/js/vendor/wcc.exe" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-llw" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$root_dir/test/wcc/llw/1/wine.json" +wine "$root_dir/package.nw/js/vendor/wcc.exe" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-llw" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$store_dir/wine.json" echo "===================" cd "$pkg_dir" && \ -"$root_dir/compiler/nodejs/wcc" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-llw" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$root_dir/test/wcc/llw/1/nodejs.json" \ No newline at end of file +"$root_dir/compiler/nodejs/wcc" "-d" "--split" ">_<9657" "-cc" "2>_<9657./pages/index/index.wxml>_<96570>_<9657./pages/logs/logs.wxml>_<96570" "-llw" "./pages/index/index>_<9657./pages/logs/logs" "./pages/index/index.wxml" "./pages/logs/logs.wxml" "-gn" "\$gwx" > "$store_dir/nodejs.json" + +diff "$store_dir/wine.json" "$store_dir/nodejs.json" >/dev/null +if [ "$?" == "0" ];then + echo "the file or dir is same!" +else + echo "the file or dir is different!" +fi \ No newline at end of file diff --git a/test/wcc/llw2.sh b/test/wcc/llw2.sh index 7c67b35..72e2ed3 100644 --- a/test/wcc/llw2.sh +++ b/test/wcc/llw2.sh @@ -3,14 +3,21 @@ root_dir=$(cd `dirname $0`/../.. && pwd -P) pkg_dir="/mnt/disk1/Project/WeCuit-Project/WeCuit-Mini-uni-test_uni_vue-cli/dist/dev/mp-weixin" # pkg_dir="/home/msojocs/Documents/we1" - +store_dir="$root_dir/test/wcc/llw/2" cd "$pkg_dir" && \ wine "$root_dir/package.nw/js/vendor/wcc.exe" "-ds" "-d" "--split" ">_<1866" "-cc" "56>_<1866./components/card.wxml>_<18660>_<1866./components/beat-char/beat-char.wxml>_<18660>_<1866./components/mytree/mytree.wxml>_<18661>_<1866mytree>_<1866./components/scroll/index.wxml>_<18660>_<1866./components/tab/index.wxml>_<18660>_<1866./miniprogram_npm/weui-miniprogram/cell/cell.wxml>_<18661>_<1866mp-cells>_<1866./miniprogram_npm/weui-miniprogram/cells/cells.wxml>_<18660>_<1866./miniprogram_npm/weui-miniprogram/loading/loading.wxml>_<18660>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml>_<18661>_<1866node>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml>_<18661>_<1866node>_<1866./pages/THEOL/THEOL.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/THEOL/dir/dir.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/THEOL/tree/tree.wxml>_<18662>_<1866mytree>_<1866mp-loading>_<1866./pages/articleView/articleView.wxml>_<18661>_<1866html-parser>_<1866./pages/auth/auth.wxml>_<18663>_<1866uni-row>_<1866uni-col>_<1866uni-title>_<1866./pages/calendar/calendar.wxml>_<18660>_<1866./pages/card/card.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/checkIn/edit.wxml>_<18663>_<1866d-form>_<1866mp-cell>_<1866mp-cells>_<1866./pages/checkIn/list.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/courseTable/courseTable.wxml>_<18660>_<1866./pages/courseTable/imgCropper/imgCropper.wxml>_<18661>_<1866image-cropper>_<1866./pages/exam/exam.wxml>_<18660>_<1866./pages/grade/grade.wxml>_<18660>_<1866./pages/index/index.wxml>_<18660>_<1866./pages/laboratory/detail.wxml>_<18660>_<1866./pages/laboratory/list.wxml>_<18660>_<1866./pages/login/login.wxml>_<18660>_<1866./pages/maintenance/maintenance.wxml>_<18661>_<1866beat-char>_<1866./pages/my/about.wxml>_<18660>_<1866./pages/my/info.wxml>_<18662>_<1866uni-row>_<1866uni-col>_<1866./pages/my/my.wxml>_<18662>_<1866uni-card>_<1866info>_<1866./pages/my/ADMag/ADMag.wxml>_<18660>_<1866./pages/my/ADMag/watchAD/watchAD.wxml>_<18660>_<1866./pages/my/bind/bind.wxml>_<18660>_<1866./pages/my/bind/mini.wxml>_<18660>_<1866./pages/my/dataMag/dataMag.wxml>_<18660>_<1866./pages/my/register/register.wxml>_<18660>_<1866./pages/my/sso/forget.wxml>_<18660>_<1866./pages/my/sso/sso.wxml>_<18662>_<1866mp-cells>_<1866mp-cell>_<1866./pages/my/sub/sub.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/newsList/newsList.wxml>_<18662>_<1866tab>_<1866scroll>_<1866./pages/officeGrade/query.wxml>_<18662>_<1866mp-cells>_<1866mp-cell>_<1866./pages/resources/list.wxml>_<18660>_<1866./pages/terms/privacy.wxml>_<18661>_<1866card>_<1866./pages/terms/terms.wxml>_<18660>_<1866./uni_modules/uni-card/components/uni-card/uni-card.wxml>_<18661>_<1866uni-icons>_<1866./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml>_<18660>_<1866./uni_modules/uni-row/components/uni-col/uni-col.wxml>_<18660>_<1866./uni_modules/uni-row/components/uni-row/uni-row.wxml>_<18660>_<1866./uni_modules/uni-title/components/uni-title/uni-title.wxml>_<18660>_<1866./wxcomponents/dynamicForm/index.wxml>_<18663>_<1866van-icon>_<1866van-uploader>_<1866time-picker>_<1866./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml>_<18660>_<1866./wxcomponents/dynamicForm/vant/icon/index.wxml>_<18661>_<1866van-info>_<1866./wxcomponents/dynamicForm/vant/info/index.wxml>_<18660>_<1866./wxcomponents/dynamicForm/vant/uploader/index.wxml>_<18661>_<1866van-icon>_<1866./wxcomponents/image-cropper/image-cropper.wxml>_<18660" "-llw" "./components/card>_<1866./components/beat-char/beat-char>_<1866./components/mytree/mytree>_<1866./components/scroll/index>_<1866./components/tab/index>_<1866./miniprogram_npm/weui-miniprogram/cell/cell>_<1866./miniprogram_npm/weui-miniprogram/cells/cells>_<1866./miniprogram_npm/weui-miniprogram/loading/loading>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/node/node>_<1866./pages/THEOL/THEOL>_<1866./pages/THEOL/dir/dir>_<1866./pages/THEOL/tree/tree>_<1866./pages/articleView/articleView>_<1866./pages/auth/auth>_<1866./pages/calendar/calendar>_<1866./pages/card/card>_<1866./pages/checkIn/edit>_<1866./pages/checkIn/list>_<1866./pages/courseTable/courseTable>_<1866./pages/courseTable/imgCropper/imgCropper>_<1866./pages/exam/exam>_<1866./pages/grade/grade>_<1866./pages/index/index>_<1866./pages/laboratory/detail>_<1866./pages/laboratory/list>_<1866./pages/login/login>_<1866./pages/maintenance/maintenance>_<1866./pages/my/about>_<1866./pages/my/info>_<1866./pages/my/my>_<1866./pages/my/ADMag/ADMag>_<1866./pages/my/ADMag/watchAD/watchAD>_<1866./pages/my/bind/bind>_<1866./pages/my/bind/mini>_<1866./pages/my/dataMag/dataMag>_<1866./pages/my/register/register>_<1866./pages/my/sso/forget>_<1866./pages/my/sso/sso>_<1866./pages/my/sub/sub>_<1866./pages/newsList/newsList>_<1866./pages/officeGrade/query>_<1866./pages/resources/list>_<1866./pages/terms/privacy>_<1866./pages/terms/terms>_<1866./uni_modules/uni-card/components/uni-card/uni-card>_<1866./uni_modules/uni-icons/components/uni-icons/uni-icons>_<1866./uni_modules/uni-row/components/uni-col/uni-col>_<1866./uni_modules/uni-row/components/uni-row/uni-row>_<1866./uni_modules/uni-title/components/uni-title/uni-title>_<1866./wxcomponents/dynamicForm/index>_<1866./wxcomponents/dynamicForm/components/timePicker/timePicker>_<1866./wxcomponents/dynamicForm/vant/icon/index>_<1866./wxcomponents/dynamicForm/vant/info/index>_<1866./wxcomponents/dynamicForm/vant/uploader/index>_<1866./wxcomponents/image-cropper/image-cropper" "./components/card.wxml" "./components/beat-char/beat-char.wxml" "./components/mytree/mytree.wxml" "./components/scroll/index.wxml" "./components/tab/index.wxml" "./miniprogram_npm/weui-miniprogram/cell/cell.wxml" "./miniprogram_npm/weui-miniprogram/cells/cells.wxml" "./miniprogram_npm/weui-miniprogram/loading/loading.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml" "./pages/THEOL/THEOL.wxml" "./pages/THEOL/dir/dir.wxml" "./pages/THEOL/tree/tree.wxml" "./pages/articleView/articleView.wxml" "./pages/auth/auth.wxml" "./pages/calendar/calendar.wxml" "./pages/card/card.wxml" "./pages/checkIn/edit.wxml" "./pages/checkIn/list.wxml" "./pages/courseTable/courseTable.wxml" "./pages/courseTable/imgCropper/imgCropper.wxml" "./pages/exam/exam.wxml" "./pages/grade/grade.wxml" "./pages/index/index.wxml" "./pages/laboratory/detail.wxml" "./pages/laboratory/list.wxml" "./pages/login/login.wxml" "./pages/maintenance/maintenance.wxml" "./pages/my/about.wxml" "./pages/my/info.wxml" "./pages/my/my.wxml" "./pages/my/ADMag/ADMag.wxml" "./pages/my/ADMag/watchAD/watchAD.wxml" "./pages/my/bind/bind.wxml" "./pages/my/bind/mini.wxml" "./pages/my/dataMag/dataMag.wxml" "./pages/my/register/register.wxml" "./pages/my/sso/forget.wxml" "./pages/my/sso/sso.wxml" "./pages/my/sub/sub.wxml" "./pages/newsList/newsList.wxml" "./pages/officeGrade/query.wxml" "./pages/resources/list.wxml" "./pages/terms/privacy.wxml" "./pages/terms/terms.wxml" "./uni_modules/uni-card/components/uni-card/uni-card.wxml" "./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml" "./uni_modules/uni-row/components/uni-col/uni-col.wxml" "./uni_modules/uni-row/components/uni-row/uni-row.wxml" "./uni_modules/uni-title/components/uni-title/uni-title.wxml" "./wxcomponents/dynamicForm/index.wxml" "./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml" "./wxcomponents/dynamicForm/vant/icon/index.wxml" "./wxcomponents/dynamicForm/vant/info/index.wxml" "./wxcomponents/dynamicForm/vant/uploader/index.wxml" "./wxcomponents/image-cropper/image-cropper.wxml" "./pages/grade/check.wxs" "./pages/laboratory/labDetail.wxs" "-gn" "\$gwx" \ - > "$root_dir/test/wcc/llw/2/wine.json" + > "$store_dir/wine.json" echo "===================" cd "$pkg_dir" && \ "$root_dir/compiler/nodejs/wcc" "-ds" "-d" "--split" ">_<1866" "-cc" "56>_<1866./components/card.wxml>_<18660>_<1866./components/beat-char/beat-char.wxml>_<18660>_<1866./components/mytree/mytree.wxml>_<18661>_<1866mytree>_<1866./components/scroll/index.wxml>_<18660>_<1866./components/tab/index.wxml>_<18660>_<1866./miniprogram_npm/weui-miniprogram/cell/cell.wxml>_<18661>_<1866mp-cells>_<1866./miniprogram_npm/weui-miniprogram/cells/cells.wxml>_<18660>_<1866./miniprogram_npm/weui-miniprogram/loading/loading.wxml>_<18660>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml>_<18661>_<1866node>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml>_<18661>_<1866node>_<1866./pages/THEOL/THEOL.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/THEOL/dir/dir.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/THEOL/tree/tree.wxml>_<18662>_<1866mytree>_<1866mp-loading>_<1866./pages/articleView/articleView.wxml>_<18661>_<1866html-parser>_<1866./pages/auth/auth.wxml>_<18663>_<1866uni-row>_<1866uni-col>_<1866uni-title>_<1866./pages/calendar/calendar.wxml>_<18660>_<1866./pages/card/card.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/checkIn/edit.wxml>_<18663>_<1866d-form>_<1866mp-cell>_<1866mp-cells>_<1866./pages/checkIn/list.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/courseTable/courseTable.wxml>_<18660>_<1866./pages/courseTable/imgCropper/imgCropper.wxml>_<18661>_<1866image-cropper>_<1866./pages/exam/exam.wxml>_<18660>_<1866./pages/grade/grade.wxml>_<18660>_<1866./pages/index/index.wxml>_<18660>_<1866./pages/laboratory/detail.wxml>_<18660>_<1866./pages/laboratory/list.wxml>_<18660>_<1866./pages/login/login.wxml>_<18660>_<1866./pages/maintenance/maintenance.wxml>_<18661>_<1866beat-char>_<1866./pages/my/about.wxml>_<18660>_<1866./pages/my/info.wxml>_<18662>_<1866uni-row>_<1866uni-col>_<1866./pages/my/my.wxml>_<18662>_<1866uni-card>_<1866info>_<1866./pages/my/ADMag/ADMag.wxml>_<18660>_<1866./pages/my/ADMag/watchAD/watchAD.wxml>_<18660>_<1866./pages/my/bind/bind.wxml>_<18660>_<1866./pages/my/bind/mini.wxml>_<18660>_<1866./pages/my/dataMag/dataMag.wxml>_<18660>_<1866./pages/my/register/register.wxml>_<18660>_<1866./pages/my/sso/forget.wxml>_<18660>_<1866./pages/my/sso/sso.wxml>_<18662>_<1866mp-cells>_<1866mp-cell>_<1866./pages/my/sub/sub.wxml>_<18662>_<1866mp-cell>_<1866mp-cells>_<1866./pages/newsList/newsList.wxml>_<18662>_<1866tab>_<1866scroll>_<1866./pages/officeGrade/query.wxml>_<18662>_<1866mp-cells>_<1866mp-cell>_<1866./pages/resources/list.wxml>_<18660>_<1866./pages/terms/privacy.wxml>_<18661>_<1866card>_<1866./pages/terms/terms.wxml>_<18660>_<1866./uni_modules/uni-card/components/uni-card/uni-card.wxml>_<18661>_<1866uni-icons>_<1866./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml>_<18660>_<1866./uni_modules/uni-row/components/uni-col/uni-col.wxml>_<18660>_<1866./uni_modules/uni-row/components/uni-row/uni-row.wxml>_<18660>_<1866./uni_modules/uni-title/components/uni-title/uni-title.wxml>_<18660>_<1866./wxcomponents/dynamicForm/index.wxml>_<18663>_<1866van-icon>_<1866van-uploader>_<1866time-picker>_<1866./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml>_<18660>_<1866./wxcomponents/dynamicForm/vant/icon/index.wxml>_<18661>_<1866van-info>_<1866./wxcomponents/dynamicForm/vant/info/index.wxml>_<18660>_<1866./wxcomponents/dynamicForm/vant/uploader/index.wxml>_<18661>_<1866van-icon>_<1866./wxcomponents/image-cropper/image-cropper.wxml>_<18660" "-llw" "./components/card>_<1866./components/beat-char/beat-char>_<1866./components/mytree/mytree>_<1866./components/scroll/index>_<1866./components/tab/index>_<1866./miniprogram_npm/weui-miniprogram/cell/cell>_<1866./miniprogram_npm/weui-miniprogram/cells/cells>_<1866./miniprogram_npm/weui-miniprogram/loading/loading>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html>_<1866./node-modules/mp-html/dist/uni-app/components/mp-html/node/node>_<1866./pages/THEOL/THEOL>_<1866./pages/THEOL/dir/dir>_<1866./pages/THEOL/tree/tree>_<1866./pages/articleView/articleView>_<1866./pages/auth/auth>_<1866./pages/calendar/calendar>_<1866./pages/card/card>_<1866./pages/checkIn/edit>_<1866./pages/checkIn/list>_<1866./pages/courseTable/courseTable>_<1866./pages/courseTable/imgCropper/imgCropper>_<1866./pages/exam/exam>_<1866./pages/grade/grade>_<1866./pages/index/index>_<1866./pages/laboratory/detail>_<1866./pages/laboratory/list>_<1866./pages/login/login>_<1866./pages/maintenance/maintenance>_<1866./pages/my/about>_<1866./pages/my/info>_<1866./pages/my/my>_<1866./pages/my/ADMag/ADMag>_<1866./pages/my/ADMag/watchAD/watchAD>_<1866./pages/my/bind/bind>_<1866./pages/my/bind/mini>_<1866./pages/my/dataMag/dataMag>_<1866./pages/my/register/register>_<1866./pages/my/sso/forget>_<1866./pages/my/sso/sso>_<1866./pages/my/sub/sub>_<1866./pages/newsList/newsList>_<1866./pages/officeGrade/query>_<1866./pages/resources/list>_<1866./pages/terms/privacy>_<1866./pages/terms/terms>_<1866./uni_modules/uni-card/components/uni-card/uni-card>_<1866./uni_modules/uni-icons/components/uni-icons/uni-icons>_<1866./uni_modules/uni-row/components/uni-col/uni-col>_<1866./uni_modules/uni-row/components/uni-row/uni-row>_<1866./uni_modules/uni-title/components/uni-title/uni-title>_<1866./wxcomponents/dynamicForm/index>_<1866./wxcomponents/dynamicForm/components/timePicker/timePicker>_<1866./wxcomponents/dynamicForm/vant/icon/index>_<1866./wxcomponents/dynamicForm/vant/info/index>_<1866./wxcomponents/dynamicForm/vant/uploader/index>_<1866./wxcomponents/image-cropper/image-cropper" "./components/card.wxml" "./components/beat-char/beat-char.wxml" "./components/mytree/mytree.wxml" "./components/scroll/index.wxml" "./components/tab/index.wxml" "./miniprogram_npm/weui-miniprogram/cell/cell.wxml" "./miniprogram_npm/weui-miniprogram/cells/cells.wxml" "./miniprogram_npm/weui-miniprogram/loading/loading.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/mp-html.wxml" "./node-modules/mp-html/dist/uni-app/components/mp-html/node/node.wxml" "./pages/THEOL/THEOL.wxml" "./pages/THEOL/dir/dir.wxml" "./pages/THEOL/tree/tree.wxml" "./pages/articleView/articleView.wxml" "./pages/auth/auth.wxml" "./pages/calendar/calendar.wxml" "./pages/card/card.wxml" "./pages/checkIn/edit.wxml" "./pages/checkIn/list.wxml" "./pages/courseTable/courseTable.wxml" "./pages/courseTable/imgCropper/imgCropper.wxml" "./pages/exam/exam.wxml" "./pages/grade/grade.wxml" "./pages/index/index.wxml" "./pages/laboratory/detail.wxml" "./pages/laboratory/list.wxml" "./pages/login/login.wxml" "./pages/maintenance/maintenance.wxml" "./pages/my/about.wxml" "./pages/my/info.wxml" "./pages/my/my.wxml" "./pages/my/ADMag/ADMag.wxml" "./pages/my/ADMag/watchAD/watchAD.wxml" "./pages/my/bind/bind.wxml" "./pages/my/bind/mini.wxml" "./pages/my/dataMag/dataMag.wxml" "./pages/my/register/register.wxml" "./pages/my/sso/forget.wxml" "./pages/my/sso/sso.wxml" "./pages/my/sub/sub.wxml" "./pages/newsList/newsList.wxml" "./pages/officeGrade/query.wxml" "./pages/resources/list.wxml" "./pages/terms/privacy.wxml" "./pages/terms/terms.wxml" "./uni_modules/uni-card/components/uni-card/uni-card.wxml" "./uni_modules/uni-icons/components/uni-icons/uni-icons.wxml" "./uni_modules/uni-row/components/uni-col/uni-col.wxml" "./uni_modules/uni-row/components/uni-row/uni-row.wxml" "./uni_modules/uni-title/components/uni-title/uni-title.wxml" "./wxcomponents/dynamicForm/index.wxml" "./wxcomponents/dynamicForm/components/timePicker/timePicker.wxml" "./wxcomponents/dynamicForm/vant/icon/index.wxml" "./wxcomponents/dynamicForm/vant/info/index.wxml" "./wxcomponents/dynamicForm/vant/uploader/index.wxml" "./wxcomponents/image-cropper/image-cropper.wxml" "./pages/grade/check.wxs" "./pages/laboratory/labDetail.wxs" "-gn" "\$gwx" \ - > "$root_dir/test/wcc/llw/2/nodejs.json" \ No newline at end of file + > "$store_dir/nodejs.json" + +diff "$store_dir/wine.json" "$store_dir/nodejs.json" >/dev/null +if [ "$?" == "0" ];then + echo "the file or dir is same!" +else + echo "the file or dir is different!" +fi \ No newline at end of file diff --git a/tools/rebuild-node-modules2 b/tools/rebuild-node-modules2 deleted file mode 100644 index e5dbf0d..0000000 --- a/tools/rebuild-node-modules2 +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -# 参数： -# 1 ---- NW版本 -# -set -e - -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" -NW_VERSION=$1 -package_dir="$DIR/../package.nw" - -if [ -z $NW_VERSION ]; then - echo "NW 版本未指定！" - exit 1 -fi -echo "目录: $DIR" -echo "NW VERSION: $NW_VERSION" - -export PATH="$DIR/../node/bin:$PATH" -PY_VERSION=`python -V 2>&1|awk '{print $2}'|awk -F '.' '{print $1}'` -if [ $PY_VERSION != 2 ]; then - hash python2 2>/dev/null || { echo >&2 "I require python2 but it's not installed. Aborting."; exit 1; } - ln -s "$( which python2 )" "$DIR/../node/bin/python" -fi - -hash nw-gyp 2>/dev/null || { - echo "=======请安装nw-gyp=======" - exit 1 -} - -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/spdlog" -rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node" -rm -fr "${package_dir}/node_modules_tmp/node_modules/nodegit" -rm -fr "${package_dir}/node_modules_tmp/node_modules/extract-file-icon" -npm install node-gyp nw-gyp -g -npm config delete registry -(npm install \ - extract-file-icon \ - native-keymap \ - native-watchdog \ - node-pty \ - oniguruma \ - spdlog@0.11.1 \ - trash \ - vscode-oniguruma \ - vscode-ripgrep \ - --prefix="${package_dir}/node_modules_tmp" ) # reinstall modules - -# rebuild -echo "nw-gyp version: $( nw-gyp --version )" - -for mod in "${package_dir}/node_modules_tmp/node_modules"/*; do - mod_name=$(basename "$mod") - echo -e "\e[1;34mrebuild $mod_name\e[0m" >&2 - cd "$mod" - case "$mod_name" in - # extract-file-icon|spdlog-node|oniguruma-node|native-keymap|node-pty-node) - # npm install - # ;; - spdlog|oniguruma|node-pty|native-watchdog|nodegit) - nw-gyp rebuild --arch=x64 --target="${NW_VERSION}" - ;; - # nodegit) - # mkdir lib - # npm install - # npm run recompile - # ;; - vscode-ripgrep) - rm -rf bin - npm install - 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" - ;; - vscode-windows-*|windows-*) - cd ../ - rm -rf "${mod}" - ;; - trash|vscode-oniguruma) - ;; - *) - echo -e "\e[1;31mcannot rebuild $mod\e[0m" >&2 - rm -rf "$mod" - ;; - esac - find -name "obj.target" | xargs -I{} rm -rf {} - find -name "*.node" | xargs -I{} cp -rf {} "${package_dir}/node_modules/$mod_name/{}" -done - -# (cd "${package_dir}/node_modules_tmp/node_modules" && find -name "obj.target" | xargs -I{} rm -rf {}) -# (cd "${package_dir}/node_modules_tmp/node_modules" && find -name "*.node" | xargs -I{} cp -rf {} ${package_dir}/node_modules/{}) - -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" - -rm -rf "${package_dir}/node_modules_tmp" - -# 移除旧配置 -# rm -fr ~/.config/wechat_devtools