Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10050) -Codechange: make it a little easier to force a version number (for releases).

Browse Source
This commit is contained in:
rubidium 2007-06-07 00:15:00 +00:00
parent ddf249b2fe
commit 75f39b1995
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
config.lib
View File

@ -5,6 +5,8 @@ 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.
@ -609,6 +611,34 @@ check_params() {
exit 1 exit 1
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
log 1 "checking revision... $revision"
log 1 "WARNING: we do not advise you to use this setting"
log 1 "WARNING: in most cases it is not safe for network use"
log 1 "WARNING: USE WITH CAUTION!"
sleep 5
elif [ -f "$ROOT_DIR/version" ]; then
revision="`cat $ROOT_DIR/version`"
log 1 "checking revision... $revision"
else
revision=""
log 1 "checking revision... svn detection"
fi
fi
} }
make_cflags_and_ldflags() { make_cflags_and_ldflags() {
@ -931,23 +961,6 @@ make_cflags_and_ldflags() {
fi fi
fi fi
if [ -n "$revision" ]; then
log 1 "checking revision... $revision"
log 1 "WARNING: we do not advise you to use this setting"
log 1 "WARNING: in most cases it is not safe for network use"
log 1 "WARNING: USE WITH CAUTION!"
sleep 5
elif [ -f "$ROOT_DIR/version" ]; then
revision="`cat $ROOT_DIR/version`"
log 1 "checking revision... $revision"
else
revision=""
log 1 "checking revision... svn detection"
fi
log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS" log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
log 1 "using LDFLAGS... $LIBS $LDFLAGS" log 1 "using LDFLAGS... $LIBS $LDFLAGS"

2
configure vendored
View File

@ -45,8 +45,8 @@ fi
set_default set_default
detect_params "$@" detect_params "$@"
save_params
check_params check_params
save_params
make_cflags_and_ldflags make_cflags_and_ldflags
EXE="" EXE=""