Update Ninja to v1.13.1

build.sh

@@ -31,17 +31,17 @@ CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
 
 # LLVM Settings
 LLVMDIR="${SRCDIR}/llvm"
-LLVMTAG="llvmorg-20.1.7"
+LLVMTAG="llvmorg-20.1.8"
 LLVMVCS="https://github.com/llvm/llvm-project.git"
 
 # Ninja Settings
 NINJADIR="${SRCDIR}/ninja"
-NINJATAG="v1.13.0"
+NINJATAG="v1.13.1"
 NINJAVCS="https://github.com/ninja-build/ninja.git"
 
 # Wine Settings
 WINEDIR="${SRCDIR}/wine"
-WINETAG="wine-10.11"
+WINETAG="wine-10.12"
 WINEVCS="https://github.com/wine-mirror/wine.git"
 
 
@@ -352,11 +352,9 @@ xtchain_build()
     case "${SYSTEM_NAME}" in
         Windows)
             CCOMPILER="${SYSTEM_HOST}-gcc"
-            EXTENSION=".ps1"
             ;;
         *)
             CCOMPILER="clang"
-            EXTENSION=""
     esac
 
     # Build XTchain tools
@@ -368,8 +366,8 @@ xtchain_build()
             ${CCOMPILER} ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
         fi
     done
-    cp ${WRKDIR}/scripts/xtclib${EXTENSION} ${BINDIR}/lib/xtchain/
+    cp ${WRKDIR}/scripts/xtclib* ${BINDIR}/lib/xtchain/
-    cp ${WRKDIR}/scripts/xtchain${EXTENSION} ${BINDIR}/
+    cp ${WRKDIR}/scripts/xtchain* ${BINDIR}/
 }
 
 # This function generates XTCHAIN version file and produces tarball archive

scripts/xtchain

@@ -7,13 +7,13 @@
 
 
 # Get the absolute path to the XTchain
-export XTCDIR="$(realpath $(dirname ${0}))"
+export XTCDIR="$(realpath $(dirname "${0}"))"
 
 # Read the XTchain version
-export XTCVER="$(cat ${XTCDIR}/Version)"
+export XTCVER="$(cat "${XTCDIR}/Version")"
 
 # Load the library
-source ${XTCDIR}/lib/xtchain/xtclib
+source "${XTCDIR}/lib/xtchain/xtclib"
 
 # Set the target architecture
 : ${TARGET:=${1}}
@@ -41,4 +41,4 @@ export PFMAT3="\[\033[0;1;97;104m\]"
 export PFMAT4="\[\033[0;94;49m\]"
 export PFMAT5="\[\033[1;38;5;74m\]"
 export PROMPT="\n${PFMAT1} XT Toolchain ${PFMAT2}${PFMAT3} \w ${PFMAT4}${PFMAT5} "
-bash --rcfile <(echo 'source ~/.bashrc && export PS1="${PROMPT}" && cd ${SRCDIR}')
+bash --rcfile <(echo 'export PS1="${PROMPT}" && cd "${SRCDIR}"')

scripts/xtchain.cmd

@@ -0,0 +1,2 @@
+@echo off
+powershell.exe -ExecutionPolicy Bypass -NoExit -File "%~dp0xtchain.ps1"

scripts/xtclib

@@ -13,8 +13,8 @@ banner()
     local XTC_BANNER="XT Toolchain v${XTCVER} for Linux"
 
     printf "###############################################################################\n\n"
-    printf "%*s\n\n" $(( (${#XTC_BANNER} + 80) / 2)) "${XTC_BANNER}"
+    printf "\033[33m%*s\033[00m\n\n" $(( (${#XTC_BANNER} + 80) / 2)) "${XTC_BANNER}"
-    printf "###############################################################################\n\n\n"
+    printf "###############################################################################\n\n"
 }
 export -f banner
 
@@ -82,7 +82,7 @@ version()
 {
     local XTCHAIN_EXTTOOLS=false
 
-    if [ ! -f ${XTCDIR}/bin/clang ] || [ "$(which clang)" != "${XTCDIR}/bin/clang" ] || [ $(echo ${XTCVER} | grep "min") ]; then
+    if [ ! -f "${XTCDIR}/bin/clang" ] || [ "$(which clang)" != "${XTCDIR}/bin/clang" ] || [ $(echo ${XTCVER} | grep "min") ]; then
         XTCHAIN_EXTTOOLS=true
         for TOOL in {clang,clang++,cmake,lld-link,ninja}; do
             which ${TOOL} &> /dev/null
@@ -97,7 +97,6 @@ version()
     banner
     echo -en "\nLLVM/Clang Compiler: $(clang --version | grep 'clang version' | cut -d' ' -f3) ($(which clang))"
     echo -en "\nLLVM/LLD Linker: $(lld-link --version | cut -d' ' -f2) ($(which lld-link))"
-    echo -en "\nLLVM Resource Compiler: $(windres --version | grep version | cut -d' ' -f5) ($(which windres))"
     echo -en "\nWine IDL Compiler: $(widl -V | grep 'version' | cut -d' ' -f5) ($(which widl))"
     echo -en "\nWine Message Compiler: $(wmc -V | grep 'version' | cut -d' ' -f5) ($(which wmc))"
     echo -en "\nWine Resource Compiler: $(wrc --version | grep 'version' | cut -d' ' -f5) ($(which wrc))"
@@ -110,7 +109,7 @@ version()
     chbuild ${BUILD_TYPE:-DEBUG}
 
     echo -en "\n\nFor a list of all supported commands, type 'help'"
-    echo -en "\n-------------------------------------------------\n\n"
+    echo -en "\n-------------------------------------------------\n\n\n"
 }
 export -f version
 

scripts/xtclib.ps1

@@ -105,7 +105,6 @@ function version {
     Write-Host
     Write-Host "LLVM/Clang Compiler: $(clang --version | Select-String -Pattern "version (\d+\.\d+\.\d+)"  | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command clang).Source))"
     Write-Host "LLVM/LLD Linker: $(lld-link --version |  Select-String -Pattern "(\d+\.\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command lld-link).Source))"
-    Write-Host "LLVM Resource Compiler: $(windres --version | Select-String -Pattern "version (\d+\.\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command windres).Source))"
     Write-Host "Wine IDL Compiler: $(widl -V | Select-String -Pattern "version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command widl).Source))"
     Write-Host "Wine Message Compiler: $(wmc -V | Select-String -Pattern "version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command wmc).Source))"
     Write-Host "Wine Resource Compiler: $(wrc --version | Select-String -Pattern "version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command wrc).Source))"
@@ -130,10 +129,6 @@ function version {
 
 # Builds application (wrapper to Ninja)
 function xbuild {
-    param(
-        [string[]]$args
-    )
-
     if (-not (Test-Path build.arch)) {
         & ninja @args
     } else {