From 521bf2204f2d934c9d6abd49e05ac915d73e81b6 Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Wed, 3 Jan 2024 08:26:51 +0000 Subject: [PATCH 1/7] fix: Increase comparison Signed-off-by: baodaoqianju --- js_framework_build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js_framework_build.sh b/js_framework_build.sh index 95192d6a..54967436 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -15,6 +15,10 @@ set -e echo "copy source code..." prebuilts_path=${11} +echo "${11}" +echo "${10}" +echo "$2" +echo "$8" # copy dependency file to generate dir of gn # the params come from .gn -- Gitee From 805d277b1e4d41ccd7297232064f9d7dee667c81 Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Thu, 4 Jan 2024 07:19:07 +0000 Subject: [PATCH 2/7] fix: Modify format Signed-off-by: baodaoqianju --- js_framework_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/js_framework_build.sh b/js_framework_build.sh index 54967436..052b759d 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -19,6 +19,7 @@ echo "${11}" echo "${10}" echo "$2" echo "$8" +ls -R "../../third_party/jsframework/runtime/src" # copy dependency file to generate dir of gn # the params come from .gn -- Gitee From 4e84957c55a399d9677cb217f996ea7b3089b2a5 Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Fri, 5 Jan 2024 02:23:17 +0000 Subject: [PATCH 3/7] fix: Modify format Signed-off-by: baodaoqianju --- js_framework_build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js_framework_build.sh b/js_framework_build.sh index 052b759d..7d41227a 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -89,3 +89,6 @@ rm -rf ./test rm -rf ./.eslintrc rm -rf ./.babelrc rm -rf ./package.json +echo "$2" +cd $2 +ls -R -- Gitee From 9afe414d9a42a4a45db731a546ca11cbf86449d2 Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Fri, 5 Jan 2024 06:56:27 +0000 Subject: [PATCH 4/7] fix: Modify format Signed-off-by: baodaoqianju --- js_framework_build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js_framework_build.sh b/js_framework_build.sh index 7d41227a..4fde03f7 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -33,6 +33,7 @@ fi # $2 => node $4 => node_modules cp -f $4 $8 +echo "TEST:copy node_modules..." if [ -d "$prebuilts_path" ]; then echo "copy node_modules..." if [ "${10}" == 'true' ];then @@ -46,6 +47,7 @@ else cp -r ./node_modules ../../third_party/jsframework fi +echo "TEST:prebuilts exists..." cp -f $5 $8 cp -f $6 $8 cp -f ${9} $8 @@ -76,6 +78,7 @@ else fi # after running, remove dependency file +echo "after running..." rm -rf ./node_modules if [ "${10}" == 'true' ];then rm -rf ./current @@ -90,5 +93,6 @@ rm -rf ./.eslintrc rm -rf ./.babelrc rm -rf ./package.json echo "$2" +ls -R "../../third_party/jsframework/runtime/src" cd $2 ls -R -- Gitee From 9902936885b110dc7c1feeddc02397da0ade6e4b Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Fri, 5 Jan 2024 08:45:44 +0000 Subject: [PATCH 5/7] fix: Increase comparison Signed-off-by: baodaoqianju --- js_framework_build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js_framework_build.sh b/js_framework_build.sh index 4fde03f7..874782e3 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -24,13 +24,16 @@ ls -R "../../third_party/jsframework/runtime/src" # the params come from .gn # copy runtime to target out, and runtime/css-what is solt link, copy it always follow symbolic links in SOURCE +echo "TEST:copy runtime to target out" if [ "${10}" == 'true' ];then cp -R -L $2 $8 else cp -r -L $2 $8 fi +echo "end TEST" # $2 => node $4 => node_modules +echo "TEST:node_modules" cp -f $4 $8 echo "TEST:copy node_modules..." @@ -46,6 +49,7 @@ else npm install cp -r ./node_modules ../../third_party/jsframework fi +echo "end TEST" echo "TEST:prebuilts exists..." cp -f $5 $8 @@ -76,9 +80,10 @@ else # run unit test npm run test:unit fi +echo "end TEST" # after running, remove dependency file -echo "after running..." +echo "TEST:after running..." rm -rf ./node_modules if [ "${10}" == 'true' ];then rm -rf ./current @@ -94,5 +99,4 @@ rm -rf ./.babelrc rm -rf ./package.json echo "$2" ls -R "../../third_party/jsframework/runtime/src" -cd $2 -ls -R +echo "======end TEST2024========" -- Gitee From e0817dd467c8e2bd6928dd9c28b984a5004d6d60 Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Fri, 5 Jan 2024 09:19:22 +0000 Subject: [PATCH 6/7] fix: Increase comparison Signed-off-by: baodaoqianju --- js_framework_build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js_framework_build.sh b/js_framework_build.sh index 874782e3..ea13a2b2 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -27,8 +27,13 @@ ls -R "../../third_party/jsframework/runtime/src" echo "TEST:copy runtime to target out" if [ "${10}" == 'true' ];then cp -R -L $2 $8 + echo "$2" + echo "$8" + echo "TEST" else cp -r -L $2 $8 + echo "$2" + echo "$8" fi echo "end TEST" -- Gitee From 11d1da0e6fb6c768f9086dd1e1126f01ca5c8b7b Mon Sep 17 00:00:00 2001 From: baodaoqianju Date: Fri, 5 Jan 2024 09:42:14 +0000 Subject: [PATCH 7/7] fix: Increase comparison Signed-off-by: baodaoqianju --- js_framework_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js_framework_build.sh b/js_framework_build.sh index ea13a2b2..28dd2c82 100755 --- a/js_framework_build.sh +++ b/js_framework_build.sh @@ -26,14 +26,14 @@ ls -R "../../third_party/jsframework/runtime/src" # copy runtime to target out, and runtime/css-what is solt link, copy it always follow symbolic links in SOURCE echo "TEST:copy runtime to target out" if [ "${10}" == 'true' ];then - cp -R -L $2 $8 echo "$2" echo "$8" echo "TEST" + cp -R -L $2 $8 else - cp -r -L $2 $8 echo "$2" echo "$8" + cp -r -L $2 $8 fi echo "end TEST" -- Gitee