实现固件批量打包

pro/src/sqlite_handle.c

@@ -4134,9 +4134,9 @@ int dev_smtp_update_send(sqlite3 *db, smtp_send_t *send)
             r = 0;
         }
     }
+quit:
 #endif
 
-quit:
     return r;
 }
 
@@ -4185,9 +4185,9 @@ int dev_smtp_update_recv(sqlite3 *db, smtp_recv_t *recv)
             r = -1;
         }
     }
+quit:
 #endif
 
-quit:
     return r;
 }
 
@@ -4302,9 +4302,9 @@ int dev_mqtt_update(sqlite3 *db, mqtt_server_t *ser)
             r = -1;
         }
     }
+quit:
 #endif
 
-quit:
     return r;
 }
 

pub

@@ -15,13 +15,7 @@ PRJ="PRJ_ANDERSON"
 #PRJ="PRJ_GOWONE_AC_I3_O3"
 #PRJ="PRJ_TEST"
 
-
-
-cmp_flag=1
-if [ $# -gt 0 ]; then
-cmp_flag=$1
-fi
-
+PRJS="PRJ_ANDERSON"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
@@ -33,6 +27,8 @@ function do_copy()
 {
     echo do_copy ...
     
+    PRJ=$1
+    
     rm -f $curdir/output/t113i/etc/network/interfaces
     mkdir -p $curdir/output/t113i/root/run/app/image
     rm -rf  $curdir/output/t113i/root/run/web
@@ -136,18 +132,21 @@ function do_copy()
         
         cp -f $custdir/db/dc_i_dc_o_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
         cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
+    elif [ "$PRJ" = "PRJ_TEST" ]; then
+        name=dc_in3_out1_test
+        cp -rf $custdir/web/general  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/cfg/cfg_test.h  $curdir/pro/config/cfg.h
+        
+        cp -f $custdir/db/ac_i3_o1_chinese.db $curdir/output/t113i/root/run/app/pdu_dat.db
+        cp -f $custdir/logo/logo_neuter.png $curdir/output/t113i/root/run/app/image/logo.png
     else
-        echo error! RPJ is wrong!!!
+        echo error! $RPJ not define!!!
         exit 1
     fi
 }
 
 function do_compile()
 {
-    if [ $1 -le 0 ]; then
-        return 0
-    fi
-
     echo do_compile ...
 
     cd $curdir/pro
@@ -175,12 +174,21 @@ function do_zip()
     mv $zname.zip $curdir/output/
 }
 
-do_copy
-do_compile $cmp_flag
-do_pack
-do_zip
-
+function do_one()
+{
+    do_copy $1
+    do_compile
+    do_pack
+    do_zip
+}
 
+function do_all()
+{
+    for s in $PRJS; do
+      do_one $s
+    done
+}
 
 
+do_all