X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/08e7da50ef47803f83f973d528c49fc4c15e97f9..261ddcef45ede2f9440342a5b3dd474e26df1679:/INSTALL/all_in_one.sh

diff --git a/INSTALL/all_in_one.sh b/INSTALL/all_in_one.sh
index d87f713..827c80b 100644
--- a/INSTALL/all_in_one.sh
+++ b/INSTALL/all_in_one.sh
@@ -1,32 +1,32 @@
 #!/bin/sh
 
 VTOY_PATH=$PWD/..
-LOGCON=$2
 
-logci() {
-    if [ -n "$LOGCON" ]; then
-        echo $* > $LOGCON
-    fi
+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
-logci "prepare_env ..."
+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/
 
-logci "build grub2 ..."
+cilog "build grub2 ..."
 cd $VTOY_PATH/GRUB2
-sh buildgrub.sh || exit 1
+sh buildgrub.sh >> $LOG 2>&1 || exit 1
 
-logci "build ipxe ..."
+cilog "build ipxe ..."
 cd $VTOY_PATH/IPXE
-sh buildipxe.sh || exit 1
+sh buildipxe.sh >> $LOG 2>&1 || exit 1
 
-logci "build edk2 ..."
+cilog "build edk2 ..."
 cd $VTOY_PATH/EDK2
-sh buildedk.sh || exit 1
+sh buildedk.sh >> $LOG 2>&1 || exit 1
 
 
 
@@ -38,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
@@ -78,8 +75,7 @@ if [ "$1" = "CI" ]; then
     sed "s/VENTOY_VERSION=.*/VENTOY_VERSION=\"$Ver\"/"  -i ./grub/grub.cfg
 fi
 
-logci "packing ventoy-$Ver ..."
-sh ventoy_pack.sh $1 || exit 1
+cilog "packing ventoy-$Ver ..."
+sh ventoy_pack.sh $1 >> $LOG 2>&1 || exit 1
 
-logci "==== finish ===="
 echo -e '\n============== SUCCESS ==================\n'