From b810d928a25470fe2a209df66d8b5a759fdfa73a Mon Sep 17 00:00:00 2001 From: luocai Date: Wed, 24 Jul 2024 11:47:11 +0800 Subject: [PATCH] update script. --- resources/build.sh | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/resources/build.sh b/resources/build.sh index ebf35fc..1b22961 100755 --- a/resources/build.sh +++ b/resources/build.sh @@ -40,13 +40,27 @@ function cmake_scan() { function qtmoc() { MOC_EXE="docker run --rm -v $(pwd):$(pwd) -w $(pwd) frp-by1.wwvvww.cn:45288/ubuntu_dev:16.04 moc" - $MOC_EXE src/qt/mainUi/mainUi.h -o src/qt/mainUi/moc_mainUi.cpp - $MOC_EXE src/qt/utility/UiTools.h -o src/qt/utility/moc_UiTools.cpp - $MOC_EXE src/qt/recoUi/recoUi.h -o src/qt/recoUi/moc_recoUi.cpp - $MOC_EXE src/qt/recoUi/recoUiRecognize.h -o src/qt/recoUi/moc_recoUiRecognize.cpp - $MOC_EXE src/qt/recoUi/recoUiRecognizeTypeBase.h -o src/qt/recoUi/moc_recoUiRecognizeTypeBase.cpp - $MOC_EXE src/qt/recoUi/recoUiCallConsole.h -o src/qt/recoUi/moc_recoUiCallConsole.cpp - $MOC_EXE src/qt/utility/DndModeCountDownItem.h -o src/qt/utility/moc_DndModeCountDownItem.cpp + declare -a files=( + "src/qt/mainUi/mainUi.h:src/qt/mainUi/moc_mainUi.cpp" + "src/qt/utility/UiTools.h:src/qt/utility/moc_UiTools.cpp" + "src/qt/recoUi/recoUi.h:src/qt/recoUi/moc_recoUi.cpp" + "src/qt/recoUi/recoUiRecognize.h:src/qt/recoUi/moc_recoUiRecognize.cpp" + "src/qt/recoUi/recoUiRecognizeTypeBase.h:src/qt/recoUi/moc_recoUiRecognizeTypeBase.cpp" + "src/qt/recoUi/recoUiCallConsole.h:src/qt/recoUi/moc_recoUiCallConsole.cpp" + "src/qt/recoUi/recoUiCallDial.h:src/qt/recoUi/moc_recoUiCallDial.cpp" + "src/qt/utility/DndModeCountDownItem.h:src/qt/utility/moc_DndModeCountDownItem.cpp" + ) + + for file in "${files[@]}"; do + IFS=":" read -r input output <<<"$file" + + if [[ -f $input ]]; then + echo "Processing $input..." + $MOC_EXE "$input" -o "$output" + else + echo "Warning: $input does not exist. Skipping..." + fi + done } function build() { @@ -111,7 +125,7 @@ function copy_ssh() { SSH_KEY=$(cat ~/.ssh/id_rsa.pub) echo "ssh copy id to ${TARGET_IP} ..." # chmod 600 ./resources/ssh_host_rsa_key_ok - ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "mount -o remount rw /oem/;mount -o remount rw /system/; mount -o remount rw /" + ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "mount -o remount rw /system/; mount -o remount rw /" ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "if [ ! -f /usr/bin/scp ]; then cp /oem/bin/scp /usr/bin/; else echo 'scp exist'; fi" ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "echo ${SSH_KEY} >> /oem/.ssh/authorized_keys" scp -i ~/Projects/ssh_host_rsa_key_ok /mnt/e/Documents/gdb-rk root@${TARGET_IP}:/sdcard/gdb @@ -140,7 +154,7 @@ function build_old() { TARGET_PATH="/data/sdcard" fi - # qtmoc + qtmoc # if [ $? -ne 0 ]; then # exit 1 # fi @@ -175,9 +189,10 @@ function deploy_old() { ssh -i ~/Projects/ssh_host_rsa_key_ok root@${TARGET_IP} "killall start-app.sh; killall GateFace; killall netconfig" fi scp -r -i ~/Projects/ssh_host_rsa_key_ok src/web/php/*.php root@${TARGET_IP}:/system/www/web/ + # scp -r -i ~/Projects/ssh_host_rsa_key_ok resources/audio/*.wav root@${TARGET_IP}:/system/audio scp -i ~/Projects/ssh_host_rsa_key_ok ./build/GateFace root@${TARGET_IP}:$TARGET_PATH + # scp -i ~/Projects/ssh_host_rsa_key_ok resources/language/FaceTick_EN.qm root@${TARGET_IP}:/system/language # scp -i ~/Projects/ssh_host_rsa_key_ok ./build/netconfig root@${TARGET_IP}:$TARGET_PATH - # scp -i ~/Projects/ssh_host_rsa_key_ok ./src/netlink/libRwNetlink.so root@${TARGET_IP}:/system/lib/ if [ $build_hisi = true ]; then scp -i ~/Projects/ssh_host_rsa_key_ok ./3rdparty/arm-himix200-linux/rwStageProtocol/lib/librwSrvProtocol.so root@${TARGET_IP}:/system/lib/