Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-27 12:15:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

exclude unused variables

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2021-05-23 19:54:24 +03:00
parent c0fa72e2ed
commit fe480f9625
2 changed files with 127 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
buildme
View File

@ -201,6 +201,31 @@ if [[ -x "${DIR_TOOLS}"/Scripts/postbuild.sh ]]; then
fi
}
buildtestsix() {
checkTools
# to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation.
rm -rf "$CLOVERROOT"/Conf
mkdir "$CLOVERROOT"/Conf
cd "${CLOVERROOT}"
echo "[BUILD CLOVERDB]"
./hebuild.sh
}
buildtestsev() {
checkTools
# to force recreation of the Conf folder. You can still use a custom CONF_PATH if you don't want recreation.
rm -rf "$CLOVERROOT"/Conf
mkdir "$CLOVERROOT"/Conf
cd "${CLOVERROOT}"
echo "[BUILD CLOVERDB]"
./ebuild.sh -t GCC53 -mc
}
buildCloverTest() {
checkTools
@ -404,6 +429,100 @@ fi
cd $HOME/Desktop/ClovUtils && git clone -q https://github.com/corpnewt/gibMacOS && open $HOME/Desktop/ClovUtils
}
testing() {
clear
echo
echo -e $COL_GREEN"-----------------------------------------------------------"$COL_RESET
cd "${CLOVERROOT}"
local lsha1="not a git repo"
if [[ -d .git ]]; then
lsha1=$(git rev-parse --short HEAD)
fi
echo -e " 🍀$COL_GREEN Clover r$(git describe --tags $(git rev-list --tags --max-count=1))$COL_WHITE (SHA: $lsha1)"$COL_RESET
echo -e $COL_CYAN" $COL_CYAN Test Builds "$COL_RESET
echo -e $COL_GREEN"-----------------------------------------------------------"$COL_RESET
echo -e "\n\n\n\n\n\n\n\n\n\n\n"
PS3='
Please enter your choice: '
options=( 'test Clover with boot6'
'test Clover with boot7'
'test build (no autogen, no boot files)'
'back to buildme'
'quit')
select opt in "${options[@]}"
do
case $opt in
"test Clover with boot6")
buildtestsix
break
;;
"test Clover with boot7")
buildtestsev
break
;;
"test build (no autogen, no boot files)")
Hackintool
break
;;
"Get BitmaskDecode")
BitmaskDecode
break
;;
"Get MaciASL")
MaciASL
break
;;
"Get dmidecode")
dmidecode
break
;;
"Get IOReg-Devices")
Get-IOReg-Devices
break
;;
"Get NativeDisplayBrightness")
NDBrightness
break
;;
"Get SSDTTime")
SSDTTime
break
;;
"Get USBMap")
USBMap
break
;;
"Get QtiASL")
QtiASL
break
;;
"Get CsrDecode")
CsrDecode
break
;;
"Get gibMacOS")
gibMacOS
break
;;
"back to buildme")
menu
break
;;
"quit")
exit
break
;;
*)
echo "invalid option $REPLY"
break
;;
esac
done
testing
}
Utilities() {
echo
echo -e $COL_GREEN"-----------------------------------------------------------"$COL_RESET
@ -520,7 +639,7 @@ fi
echo -e " 🍀$COL_GREEN Clover r$(git describe --tags $(git rev-list --tags --max-count=1))$COL_WHITE (SHA: $lsha1)"$COL_RESET
echo -e "$COL_CYAN TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme XCODE8')"
echo -e $COL_GREEN"-----------------------------------------------------------"$COL_RESET
echo
echo -e "\n\n\n\n\n\n\n\n"
PS3='
Please enter your choice: '
options=( 'build Clover'
@ -531,10 +650,10 @@ options=( 'build Clover'
'make app (with Clover)'
'make iso'
'build all'
'test Clover'
'status'
'show diff'
'open CloverV2/EFI/CLOVER directory'
'test build (no autogen, no boot files)'
'update Clover (reset changes)'
'clean BaseTools'
'Utilities'
@ -582,6 +701,10 @@ do
buildApp
break
;;
"test Clover")
testing
break
;;
"status")
checkStatus
break
@ -599,10 +722,6 @@ do
fi
break
;;
"test build (no autogen, no boot files)")
buildCloverTest
break
;;
"update Clover (reset changes)")
read -p "Are you sure? (type y to confirm or any other to negate) " -n 1 -r
echo

5
rEFIt_UEFI/Settings/Self.cpp
View File

@ -68,8 +68,8 @@ EFI_STATUS Self::__initialize(EFI_HANDLE SelfImageHandle, EFI_LOADED_IMAGE** Sel
}
*efiFileNamePtr = CloverDirFullPath.basename();
XStringW& efiFileName = *efiFileNamePtr;
#ifdef JIEF_DEBUG
XStringW& efiFileName = *efiFileNamePtr;
DBG("efiFileName=%ls\n", efiFileName.wc_str());
#endif
@ -95,9 +95,8 @@ EFI_STATUS Self::__initialize(EFI_HANDLE SelfImageHandle, EFI_LOADED_IMAGE** Sel
*CloverDirPtr = NULL;
return RETURN_LOAD_ERROR;
}
EFI_FILE* CloverDir = *CloverDirPtr;
#ifdef JIEF_DEBUG
EFI_FILE* CloverDir = *CloverDirPtr;
DBG("CloverDir = %lld\n", uintptr_t(CloverDir));
#endif