KillingFloor2/KF2-BuildTools
KillingFloor2/KF2-BuildTools
1
0
Fork 0
Code

sugar

Browse Source
This commit is contained in:
GenZmeY 2022-03-25 11:14:48 +03:00
parent b250635f88
commit 06642bf7e3
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builder
View File

@ -554,6 +554,11 @@ function compiled ()
done done
} }
function find_log ()
{
find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" "
}
function compile () function compile ()
{ {
local StripSourceArg="" local StripSourceArg=""
@ -602,8 +607,7 @@ function compile ()
if is_true "$ArgHoldEditor"; then if is_true "$ArgHoldEditor"; then
CMD //C "$(cygpath -w "$KFEditor") make $StripSourceArg -useunpublished" CMD //C "$(cygpath -w "$KFEditor") make $StripSourceArg -useunpublished"
Logfile="$(find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" ")" parse_log "$(find_log)"
parse_log "$Logfile"
if ! compiled; then if ! compiled; then
die "compilation failed" die "compilation failed"
fi fi
@ -614,7 +618,7 @@ function compile ()
while ps -p "$PID" &> /dev/null while ps -p "$PID" &> /dev/null
do do
sleep 1 sleep 1
Logfile="$(find "$KFLogs" -printf '%T+ %p\n' | sort -r | head -n1 | cut -f2- -d" ")" Logfile="$(find_log)"
if compiled; then if compiled; then
msg "${GRN}successfully compiled${DEF}" msg "${GRN}successfully compiled${DEF}"
@ -819,11 +823,11 @@ function run_test ()
read_settings read_settings
if ! brewed; then if brewed; then
msg "run test (brewed)"
else
UseUnpublished="-useunpublished" UseUnpublished="-useunpublished"
msg "run test (unpublished)" msg "run test (unpublished)"
else
msg "run test (brewed)"
fi fi
CMD //C "$(cygpath -w "$KFGame") $Map?Difficulty=$Difficulty?GameLength=$GameLength?Game=$Game?Mutator=$Mutators?$Args $UseUnpublished" -log CMD //C "$(cygpath -w "$KFGame") $Map?Difficulty=$Difficulty?GameLength=$GameLength?Game=$Game?Mutator=$Mutators?$Args $UseUnpublished" -log
@ -895,7 +899,7 @@ function main ()
export PATH="$PATH:$ThirdPartyBin" export PATH="$PATH:$ThirdPartyBin"
# Modifiers # Modifiers
if is_true "$ArgDebug"; then set -o xtrace; fi if is_true "$ArgDebug"; then set -o xtrace; fi
# Help # Help
if is_true "$ArgVersion" && is_true "$ArgHelp"; then version; usage; die "" 0; fi if is_true "$ArgVersion" && is_true "$ArgHelp"; then version; usage; die "" 0; fi
@ -903,7 +907,7 @@ function main ()
if is_true "$ArgHelp"; then usage; die "" 0; fi if is_true "$ArgHelp"; then usage; die "" 0; fi
# Backup # Backup
if is_true "$ArgCompile" || is_true "$ArgBrew"; then backup_kfeditorconf; fi if is_true "$ArgCompile" || is_true "$ArgBrew"; then backup_kfeditorconf; fi
# Actions # Actions
if is_true "$ArgInit"; then init; fi if is_true "$ArgInit"; then init; fi
@ -914,7 +918,7 @@ function main ()
if is_true "$ArgTest"; then run_test; fi if is_true "$ArgTest"; then run_test; fi
# Restore # Restore
if is_true "$ArgCompile" || is_true "$ArgBrew"; then restore_kfeditorconf; fi if is_true "$ArgCompile" || is_true "$ArgBrew"; then restore_kfeditorconf; fi
} }
main "$@" main "$@"