update the dailybuild folder data format. only save success build

m-labs · Jan 27, 2012 · 6b0b6f8 · 6b0b6f8
1 parent 0afd8dd
commit 6b0b6f8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/scripts/compile-milkymist-firmware.sh b/scripts/compile-milkymist-firmware.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-DATE=$(date "+%Y-%m-%d")
-TIME=$(date "+%H-%M-%S")
-DATE_TIME=`date +"%m%d%Y-%H%M"`
+DATE_TIME=`date +"%Y%m%d-%H%M"`
 
 
-IMAGES_DIR="/home/xiangfu/build-milkymist/milkymist-firmware-${DATE_TIME}"
+IMAGES_DIR="/home/xiangfu/building/Milkymist/milkymist-firmware-${DATE_TIME}"
+DEST_DIR="/home/xiangfu/build-milkymist"
 mkdir -p ${IMAGES_DIR}
+mkdir -p ${DEST_DIR}
 
 
 BUILD_LOG="${IMAGES_DIR}/BUILD_LOG"
@@ -59,6 +59,7 @@ if [ ! -e ${MILKYMIST_GIT_DIR}/wernermisc ]; then
 	git clone git://projects.qi-hardware.com/wernermisc.git ${MILKYMIST_GIT_DIR}/wernermisc
 fi
 (cd ${MILKYMIST_GIT_DIR}/wernermisc && git fetch -a && git reset --hard origin/master)
+(cd ${MILKYMIST_GIT_DIR}/rtems && git reset --hard f80b3a3d825110b5d8826f72db3fa47a6d71b66a)
 (cd ${MILKYMIST_GIT_DIR}/rtems && rm -f patches && ln -s ${MILKYMIST_GIT_DIR}/wernermisc/m1/patches/rtems patches && quilt push -a)
 
 
@@ -161,6 +162,8 @@ cp -a ${MILKYMIST_GIT_DIR}/wernermisc/m1/patches/rtems ${IMAGES_DIR}/rtems-patch
 echo "create SDK ..."
 (cd /opt/ && tar cjvf ${IMAGES_DIR}/Flickernoise-lm32-rtems-4.11-SDK-for-Linux-x86_64.tar.bz2 rtems-4.11/)
 
+mv ${IMAGES_DIR} ${DEST_DIR}
+
 echo -e "\
 say #milkymist The Firmware build was successfull, \
 see images here: http://fidelio.qi-hardware.com/~xiangfu/build-milkymist/milkymist-firmware-${DATE_TIME}/\nclose" \

diff --git a/scripts/compile-openwrt-milkymist.sh b/scripts/compile-openwrt-milkymist.sh
@@ -7,15 +7,16 @@ CONFIG_FILE_TYPE="config."$1
 MAKE_VARS=" V=99 IGNORE_ERRORS=m -j4 "
 
 ########################################################################
-DATE=$(date "+%Y-%m-%d")
-TIME=$(date "+%H-%M-%S")
-DATE_TIME=`date +"%m%d%Y-%H%M"`
+DATE_TIME=`date +"%Y%m%d-%H%M"`
 
 GET_FEEDS_VERSION_SH="/home/xiangfu/bin/get-feeds-revision.sh"
 PATCH_OPENWRT_SH="/home/xiangfu/bin/patch-openwrt.sh"
 
-IMAGES_DIR="/home/xiangfu/build-milkymist/milkymist-openwrt.$1-${DATE_TIME}/"
+IMAGES_DIR="/home/xiangfu/building/Milkymist/milkymist-openwrt.$1-${DATE_TIME}/"
+DEST_DIR="/home/xiangfu/build-milkymist"
 mkdir -p ${IMAGES_DIR}
+mkdir -p ${DEST_DIR}
+
 
 BUILD_LOG="${IMAGES_DIR}/BUILD_LOG"
 VERSIONS_FILE="${IMAGES_DIR}/VERSIONS"
@@ -99,4 +100,6 @@ cp -a bin/lm32/* ${IMAGES_DIR} 2>/dev/null
  bzip2 -z BUILD_LOG; \
 )
 
-echo "DONE :)"
+mv ${IMAGES_DIR} ${DEST_DIR}
+
+echo "DONE!"