X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/17da2e2a21bb3eb37bfc2a3b0dbba12fdcd04a1d..9c3e1a688066371c895d1e15e5d654a5f2a4d7af:/INSTALL/all_in_one.sh

diff --git a/INSTALL/all_in_one.sh b/INSTALL/all_in_one.sh
index e828d31..827c80b 100644
--- a/INSTALL/all_in_one.sh
+++ b/INSTALL/all_in_one.sh
@@ -2,20 +2,31 @@
 
 VTOY_PATH=$PWD/..
 
+cilog() {
+    datestr=$(date +"%Y/%m/%d %H:%M:%S")
+    echo "$datestr $*"
+}
+
+LOG=$VTOY_PATH/DOC/build.log
+[ -f $LOG ] && rm -f $LOG
+
 cd $VTOY_PATH/DOC
+cilog "prepare_env ..."
 sh prepare_env.sh
 
-export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin
-
+export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin:/opt/mips-loongson-gcc7.3-linux-gnu/2019.06-29/bin/:/opt/mips64el-linux-musl-gcc730/bin/
 
+cilog "build grub2 ..."
 cd $VTOY_PATH/GRUB2
-sh buildgrub.sh || exit 1
+sh buildgrub.sh >> $LOG 2>&1 || exit 1
 
+cilog "build ipxe ..."
 cd $VTOY_PATH/IPXE
-sh buildipxe.sh || exit 1
+sh buildipxe.sh >> $LOG 2>&1 || exit 1
 
+cilog "build edk2 ..."
 cd $VTOY_PATH/EDK2
-sh buildedk.sh || exit 1
+sh buildedk.sh >> $LOG 2>&1 || exit 1
 
 
 
@@ -27,13 +38,10 @@ sh buildedk.sh || exit 1
 #cd $VTOY_PATH/VtoyTool
 #sh build.sh || exit 1
 
-#cd $VTOY_PATH/vtoyfat/fat_io_lib
+#cd $VTOY_PATH/vtoycli/fat_io_lib
 #sh buildlib.sh
 
-#cd $VTOY_PATH/vtoyfat
-#sh build.sh || exit 1
-
-#cd $VTOY_PATH/vtoygpt
+#cd $VTOY_PATH/vtoycli
 #sh build.sh || exit 1
 
 #cd $VTOY_PATH/FUSEISO
@@ -64,9 +72,10 @@ cd $VTOY_PATH/INSTALL
 
 if [ "$1" = "CI" ]; then
     Ver=$(date +%m%d%H%M)
-    sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=$Ver/"  -i ./grub/grub.cfg
+    sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=\"$Ver\"/"  -i ./grub/grub.cfg
 fi
 
-sh ventoy_pack.sh || exit 1
+cilog "packing ventoy-$Ver ..."
+sh ventoy_pack.sh $1 >> $LOG 2>&1 || exit 1
 
 echo -e '\n============== SUCCESS ==================\n'