sat23 пре 4 година
родитељ
комит
cb068f2b86
1 измењених фајлова са 36 додато и 24 уклоњено
  1. 36 24
      crontask/dailybuild_rt2841_2851

+ 36 - 24
crontask/dailybuild_rt2841_2851

@@ -1,44 +1,56 @@
 #!/bin/bash
+# 是否要重新下载;
+Redownload=$1
+if [ ! $Redownload ]; then
+    Redownload=false
+fi
+echo "Redownload=${Redownload}" 
 
 # 换服务器编译时,这里的PATH要以新服务器的环境变量重新配置
 export PATH=/opt/git-repo:/usr/lib/jvm/java-8-openjdk-amd64/bin:/home/wjf/.platformio/penv/bin:/home/wjf/.platformio/penv:/scbc_data/wjf/.vscode-server/bin/5763d909d5f12fe19f215cbfdd29a91c0fa9208a/bin:/opt/git-repo:/usr/lib/jvm/java-8-openjdk-amd64/bin:/home/wjf/.vscode-server/bin/5763d909d5f12fe19f215cbfdd29a91c0fa9208a/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
 
-
 # 删除目录;
 cd ~
-if [ -d "dailybuild" ]; then
-	rm -rf ~/dailybuild
-	echo "rm -rf ~/dailybuild finished"
+if [ $Redownload == true ]; then
+    if [ -d "dailybuild" ]; then
+        echo "rm -rf ~/dailybuild begin "$(date +"%Y-%m-%d %T")
+        rm -rf ~/dailybuild
+        echo "rm -rf ~/dailybuild finished "$(date +"%Y-%m-%d %T")
+    fi
+
+    # 创建目录;
+    mkdir dailybuild
+    echo "mkdir dailybuild finished "$(date +"%Y-%m-%d %T")
 fi
 
-# 创建目录;
-mkdir dailybuild
-echo "mkdir dailybuild finished"
-
 # 重新更新代码;
 cd ~/dailybuild/
 repo init -u ssh://10.126.16.60:29418/rt2841_manifest -m odin-gms.xml -b master
-echo "repo init dailybuild finished"
+echo "repo init dailybuild finished "$(date +"%Y-%m-%d %T")
 repo sync -j12
-echo "repo init dailybuild finished"
+echo "repo sync dailybuild finished "$(date +"%Y-%m-%d %T")
+
+if [ $Redownload == true ]; then
+    # 简单防止更新失败,再次重新;
+    echo "repo sync-2 dailybuild start "$(date +"%Y-%m-%d %T")
+    repo sync -j12
+    echo "repo sync-2 dailybuild finished "$(date +"%Y-%m-%d %T")
+fi
 
 # 编译2841主干代码;
-echo "Start: Daily build for RT2841 master branch"
+echo "Start: Daily build for RT2841 master branch "$(date +"%Y-%m-%d %T")
 cd ~/dailybuild/
-cp ~/crontask/dailybuild_rt2841_master.sh .
-./dailybuild_rt2841_master.sh
-echo "End: Daily build for RT2841 master branch"
+repo forall -c "pwd && git clean -xfd && git checkout -- ."
+rm -rf ~/dailybuild/kernel/android/pie/out
+./SCBC_build.sh true
+echo "End: Daily build for RT2841 master branch "$(date +"%Y-%m-%d %T")
 
 # 编译2851主干代码;
-echo "Start: Daily build for RT2851 master branch"
+echo "Start: Daily build for RT2851 master branch "$(date +"%Y-%m-%d %T")
 cd ~/dailybuild/
-cp ~/crontask/dailybuild_rt2851_master.sh .
-./dailybuild_rt2851_master.sh
-echo "End: Daily build for RT2851 master branch"
-
-#echo "generate the manifest for the current reversion"
-#var_d=`date '+%m%d%H'`
-#version="V$var_d"
-#repo manifest -r -o manifest-master-$version.xml
-#cp manifest-master-$version.xml /home/RT2841_2851_dailybuild/
+repo forall -c "pwd && git clean -xfd && git checkout -- ."
+rm -rf ~/dailybuild/kernel/android/pie/out
+./SCBC_build_4K_2851.sh true
+echo "End: Daily build for RT2851 master branch "$(date +"%Y-%m-%d %T")
 
+echo "all finished"