diff --git a/lib/build.sh b/lib/build.sh index ba1381a..66dba6f 100755 --- a/lib/build.sh +++ b/lib/build.sh @@ -30,7 +30,7 @@ echo $ver export COMMIT=$ver arduinoset=$home/.arduino15 -mkdir -p /tmp/${me}_build /tmp/${me}_cach +mkdir -p /tmp/${me}_build /tmp/${me}_cache #传递宏定义 GIT_VER 到源码中,源码git版本 fqbn="esp8266:esp8266:espduino:ResetMethod=v1,UploadTool=esptool,xtal=160,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=4816,non32xfer=fast,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=460800" diff --git a/lib/fabu.sh b/lib/fabu.sh index 9eb1eab..c20e573 100755 --- a/lib/fabu.sh +++ b/lib/fabu.sh @@ -1,5 +1,6 @@ #!/bin/bash cd `dirname $0` +cd .. branch=`git status |head -n 1 |awk '{print $2}'` a=`git log --date=short -1 |head -n 1 |awk '{print $2}'` @@ -7,8 +8,8 @@ date=`git log --date=short -1 |grep ^Date: |awk '{print $2}' |tr -d '-'` ver=$date-${a:0:8} echo $ver git tag $ver -./build.sh +lib/build.sh git log >changelog.txt -cp ../doc/readme3.pdf ../doc/readme3.txt . -tar cvfz wifi_disp_$ver.tar.gz wifi_disp.bin wifi_disp.php changelog.txt readme3.* update.sh *.py +cp doc/readme3.pdf doc/readme3.txt . +tar cvfz wifi_disp_$ver.tar.gz lib/wifi_disp.bin lib/wifi_disp.php changelog.txt readme3.* lib/update.sh lib/*.py rm changelog.txt readme3.pdf readme3.txt