Skip to content

Commit f66297e

Browse files
committed
update build system by LAbyOne
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
1 parent 42172b4 commit f66297e

File tree

4 files changed

+31
-16
lines changed

4 files changed

+31
-16
lines changed

CloverPackage/package/po/clover.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Clover r5146\n"
10-
"POT-Creation-Date: 2022-06-23 20:44+0300\n"
9+
"Project-Id-Version: Clover r5149\n"
10+
"POT-Creation-Date: 2022-10-17 22:07+0300\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313
"Language-Team: LANGUAGE <LL@li.org>\n"

build_gcc12.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ set -u # exit with error if unbound variables
2727
# GCC toolchain source version
2828
# here we can change source versions of tools
2929
#
30-
export BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-2.38}
31-
export GCC_VERSION=${GCC_VERSION:-12.1.0}
30+
export BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-2.39}
31+
export GCC_VERSION=${GCC_VERSION:-12.2.0}
3232

3333
# Version of libraries are from ./contrib/download_prerequisites in gcc source directory
3434
export GMP_VERSION=${GMP_VERSION:-gmp-6.2.1}
@@ -360,7 +360,7 @@ CompileBinutils () {
360360
rm -rf "$BUILD_BINUTILS_DIR"
361361
mkdir -p "$BUILD_BINUTILS_DIR" && cd "$BUILD_BINUTILS_DIR"
362362
echo "- ${BINUTILS_VERSION} configure..."
363-
local cmd="LDFLAGS=\"-dead_strip\" ${BINUTILS_DIR}/configure --host=${BUILDARCH}-apple-darwin${BUILDREV} --enable-plugins --build=${BUILDARCH}-apple-darwin${BUILDREV} --target=$TARGET --prefix=$PREFIX/cross --with-included-gettext --disable-werror --with-gmp=$PREFIX --with-mpfr=$PREFIX --with-mpc=$PREFIX --with-isl=$PREFIX --disable-isl-version-check --disable-nls --enable-deterministic-archives --with-mmap --with-system-zlib"
363+
local cmd="LDFLAGS=\"-dead_strip\" ${BINUTILS_DIR}/configure --host=${BUILDARCH}-apple-darwin${BUILDREV} --enable-plugins --build=${BUILDARCH}-apple-darwin${BUILDREV} --target=$TARGET --prefix=$PREFIX/cross --with-included-gettext --disable-werror --with-gmp=$PREFIX --with-mpfr=$PREFIX --with-mpc=$PREFIX --with-isl=$PREFIX --disable-isl-version-check --disable-nls --enable-deterministic-archives --with-mmap --with-system-zlib --enable-gprofng=NO"
364364
local logfile="$DIR_LOGS/binutils.$ARCH.configure.log.txt"
365365
echo "$cmd" > "$logfile"
366366
eval "$cmd" >> "$logfile" 2>&1

buildgettext.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -u
1010
# Gettext source version
1111
# here we can change source versions of tools
1212
#
13-
export GETTEXT_VERSION=${GETTEXT_VERSION:-gettext-0.20.1}
13+
export GETTEXT_VERSION=${GETTEXT_VERSION:-gettext-0.21.1}
1414

1515
# Change PREFIX if you want gettext installed on different place
1616
#
@@ -95,7 +95,7 @@ fnDownloadGettext ()
9595
local tarball="${GETTEXT_VERSION}.tar.xz"
9696
if [[ ! -f "$tarball" ]]; then
9797
echo "Status: $tarball not found."
98-
curl -f -o download.tmp --remote-name https://ftp.gnu.org/pub/gnu/gettext/$tarball || exit 1
98+
curl -k -f -o download.tmp --remote-name https://ftp.gnu.org/pub/gnu/gettext/$tarball || exit 1
9999
mv download.tmp $tarball
100100
fi
101101
}

buildme

+24-9
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ declare -r SYSNAME="$(uname)"
2626
MYTOOLCHAIN=${1:-GCC53}
2727
revision=$(git describe --tags $(git rev-list --tags --max-count=1))
2828
lsha1="not a git repo"
29+
pyversion=$(echo $COL_CYAN"Installed Python version: "$COL_WHITE$(/usr/local/bin/python3 --version))
30+
pynone=$(echo -e "$COL_RED Python3 seems missing on this machine, it is required to build Clover ")
2931
export DIR_OUT=${DIR_OUT:-"$CLOVERROOT"/toolchain/tools/output}
3032
export DIR_SCT=${DIR_SCT:-${CLOVERROOT}/toolchain/tools/Scripts}
3133
if [[ ! -d ${DIR_SCT} ]] || [[ ! -d ${DIR_OUT} ]]; then
@@ -240,7 +242,12 @@ buildClover() {
240242
./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D LESS_DEBUG -t $MYTOOLCHAIN
241243
fi
242244
fi
243-
# Run a post build script if exist (${DIR_TOOLS}/Scripts/postbuild.sh)
245+
# Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh)
246+
if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then
247+
echo "Running Clover postbuild script"
248+
"${DIR_TOOLS}"/CloverScripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN
249+
fi
250+
# Run a custom post build script if exist (${DIR_TOOLS}/Scripts/postbuild.sh)
244251
if [[ -x "${DIR_TOOLS}"/Scripts/postbuild.sh ]]; then
245252
echo "Running postbuild script"
246253
"${DIR_TOOLS}"/Scripts/postbuild.sh "${CLOVERROOT}" $MYTOOLCHAIN
@@ -452,13 +459,13 @@ USBMap() {
452459
open $HOME/Desktop/ClovUtils
453460
}
454461

455-
QtiASL() {
462+
Xiasl() {
456463
if [[ ! -d $HOME/Desktop/ClovUtils ]]; then
457464
mkdir -p $HOME/Desktop/ClovUtils
458465
fi
459-
cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/ic005k/QtiASL/releases/download/1.1.63/Xiasl_Mac.dmg > Xiasl_Mac.dmg
466+
cd $HOME/Desktop/ClovUtils && curl -sLq https://github.com/ic005k/Xiasl/releases/download/1.1.66/Xiasl_Mac.dmg > Xiasl_Mac.dmg
460467
hdiutil attach -quiet -noverify -nobrowse Xiasl_Mac.dmg && cp -Rf /Volumes/bin\:release\:Xiasl/Xiasl.app $HOME/Desktop/ClovUtils
461-
hdiutil detach -force /Volumes/bin\:release\:QtiASL
468+
hdiutil detach -force /Volumes/bin\:release\:Xiasl
462469
rm -r $HOME/Desktop/ClovUtils/Xiasl_Mac.dmg && open $HOME/Desktop/ClovUtils
463470
}
464471

@@ -553,7 +560,7 @@ options=( 'Get CloverConfigPlistValidator '
553560
'Get NativeDisplayBrightness '
554561
'Get SSDTTime'
555562
'Get USBMap'
556-
'Get QtiASL'
563+
'Get Xiasl'
557564
'Get CsrDecode'
558565
'Get gibMacOS'
559566
'Get mountR/W'
@@ -602,8 +609,8 @@ select opt in "${options[@]}"
602609
USBMap
603610
break
604611
;;
605-
"Get QtiASL")
606-
QtiASL
612+
"Get Xiasl")
613+
Xiasl
607614
break
608615
;;
609616
"Get CsrDecode")
@@ -638,10 +645,18 @@ Utilities
638645
menu() {
639646
echo
640647
echo -e $COL_GREEN" ------------------------------------------------------------------------------"
641-
echo -e " 🍀 Clover r${revision}$COL_WHITE (SHA: $lsha1)"
648+
if [[ ! -x "/usr/local/bin/pip3" ]]; then
649+
echo -e " ${pynone}"
650+
fi
651+
echo -e "$COL_GREEN 🍀 Clover r${revision}$COL_WHITE (SHA: $lsha1)"
642652
echo -e "$COL_CYAN TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme XCODE8')"
643-
echo -e $COL_GREEN" ------------------------------------------------------------------------------"$COL_RESET
653+
if [[ -x "/usr/local/bin/pip3" ]]; then
654+
echo -e $COL_GREEN" ------------------- ${pyversion}$COL_GREEN ------------------ "$COL_RESET
644655
echo -e "\n\n\n\n\n\n\n\n"
656+
else
657+
echo -e $COL_GREEN" ------------------------------------------------------------------------------"$COL_RESET
658+
echo -e "\n\n\n\n\n\n\n"
659+
fi
645660
PS3='
646661
Please enter your choice: '
647662
options=( 'build Clover'

0 commit comments

Comments
 (0)