mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21352) -Codechange: remove some unneeded code from config.lib

release/1.1
rubidium 2010-11-29 13:09:35 +00:00
parent 4aa6a24d95
commit c0312e1011
1 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config.lib
View File

@ -11,8 +11,6 @@ log() {
} }
set_default() { set_default() {
released_version=""
ignore_extra_parameters="0" ignore_extra_parameters="0"
# We set all kinds of defaults for params. Later on the user can override # We set all kinds of defaults for params. Later on the user can override
# most of them; but if they don't, this default is used. # most of them; but if they don't, this default is used.
@ -990,16 +988,6 @@ check_params() {
fi fi
fi fi
if [ -n "$released_version" ]; then
log 1 "checking revision... release ($released_version)"
if [ -n "$revision" ] && [ "$revision" != "$released_version" ]; then
log 1 "WARNING: overriding of the revision is NOT possible for releases"
log 1 "WARNING: the given revision is IGNORED"
sleep 5
fi
revision=$released_version
else
if [ -n "$revision" ]; then if [ -n "$revision" ]; then
log 1 "checking revision... $revision" log 1 "checking revision... $revision"
log 1 "WARNING: we do not advise you to use this setting" log 1 "WARNING: we do not advise you to use this setting"
@ -1020,7 +1008,7 @@ check_params() {
elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
revision="" revision=""
log 1 "checking revision... hg detection" log 1 "checking revision... hg detection"
elif [ -f "$ROOT_DIR/.rev" ]; then elif [ -f "$ROOT_DIR/.ottdrev" ]; then
revision="" revision=""
log 1 "checking revision... source tarball" log 1 "checking revision... source tarball"
else else
@ -1035,7 +1023,6 @@ check_params() {
sleep 5 sleep 5
fi fi
fi
if [ "$doc_dir" = "1" ]; then if [ "$doc_dir" = "1" ]; then
if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then