Merge in xonotic/xonotic.git: matthiaskrgr/all_compile_map_time
git-manager created issue #1691 on 2013-06-17T23:54:11Z:
Purpose of the branch:
Make xonotify tell how long the map might take to compile, according to previous compile.
Repository: xonotic/xonotic.git Commit: d3aba68a Branch: matthiaskrgr/all_compile_map_time
Merge commands:
cd .
git checkout master
git reset --hard origin/master
git pull && git diff 'd3aba68a0cb4d4fe8b55e4e97403c72ecfe67f35'..'origin/matthiaskrgr/all_compile_map_time'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/matthiaskrgr/all_compile_map_time'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'matthiaskrgr/all_compile_map_time'
Diffstat:
misc/tools/xonotic-map-compiler-optionsfile | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
Revision log:
commit d3aba68a0cb4d4fe8b55e4e97403c72ecfe67f35
Author: Matthias Krüger
Commit: Matthias Krüger
xonotic-map-compiler-optionsfile: fix check if file exists.
commit fc2c66b2252208ae54f6e4739dc211fc0ca325eb
Author: Matthias Krüger
Commit: Matthias Krüger
xonotic-map-compiler-optionsfile: oops, do not try reading compiletimes for maps we have no data for.
commit fd144c75e4f059765667f39f06def82e97dbb1f6
Author: Matthias Krüger
Commit: Matthias Krüger
xonotic-map-compiler-optionsfile: don't overwrite compile time if the mapbuild failed.
commit ca3578bf57a17d2d9343e52649cc8b636794d84d
Author: Matthias Krüger
Commit: Matthias Krüger
xonotic-map-compiler-optionsfile: print in how many minutes the compile should finish approximately.
commit d6b69254f7278737e04d446b64e37f4e8cd28f06
Author: Matthias Krüger
Commit: Matthias Krüger
xonotic-map-compiler-optionsfile : store seconds in file $M:30
commit 85c67feacc3529b00a244e7dfce6525e609767c3
Author: Matthias Krüger
Commit: Matthias Krüger
xonotic-map-compiler : add function which simply tracks the seconds map build has taken.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/misc/tools/xonotic-map-compiler-optionsfile b/misc/tools/xonotic-map-compiler-optionsfile
index 1666c5b..eb614eb 100755
— a/misc/tools/xonotic-map-compiler-optionsfile
**+ b/misc/tools/xonotic-map-compiler-optionsfile
@ -9,4 +9,19
@ if [ ~~n “\$sz” ]; then
else
minimap\_override=
fi
~~misc/tools/xonotic-map-compiler “\$M” `grep \^- “\$M.map.options” | cut ~~d ‘\#’~~f 1` \$minimap\_override “\$`` "
+
+mkdir -p ~/.xonotic-map-compiler-autobuild/ # to store map compile times in
+tstart=date +%s
+
+if [ -f ~/.xonotic-map-compiler-autobuild/${M:30} ] ; then
- lasttime=
cat ~/.xonotic-map-compiler-autobuild/${M:30} 2>/dev/null
# oppress warnings if file doesn't exist - echo "Done in approximately
((
lasttime/60)) minutes." +fi
+misc/tools/xonotic-map-compiler "$M" grep ^- "$M.map.options" | cut -d '#' -f 1
minimap_override "
``” || mapfail=true
*
tend=`date%s`
*let tdelta=$tend-$tstart # compute time
*if [[ ! ${mapfail} ]] ; then
- echo $tdelta > /.xonotic-map-compiler-autobuild/${M:30}\ #\ save\ time\ in/.xonotic-map-compiler-autobuild/mapname +fi