Author: esr
Date: Wed Apr 25 18:48:33 2007
New Revision: 17094
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17094&view=rev
Log:
Minor fixes for SVN-revision display.
Modified:
trunk/configure.ac
trunk/src/Makefile.am
trunk/src/game.cpp
trunk/src/titlescreen.cpp
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=17094&r1=17093&r2=17094&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Apr 25 18:48:33 2007
@@ -238,7 +238,7 @@
[internaldata=no])
AC_ARG_ENABLE([display-revision],
- AS_HELP_STRING([--display-revisiion], [enable svn revision
display]),
+ AS_HELP_STRING([--enable-display-revision], [enable svn revision
display]),
[svnrev=$enableval],
[svnrev=no])
@@ -247,6 +247,7 @@
AM_CONDITIONAL([SERVER], [test x$server = xyes])
AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
+AM_CONDITIONAL([USESVN], [test x$svnrev = xyes])
AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
AM_CONDITIONAL([GCC], [test x$GXX = xyes])
AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
Modified: trunk/src/Makefile.am
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=17094&r1=17093&r2=17094&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Apr 25 18:48:33 2007
@@ -1,4 +1,4 @@
-SVNREV = $(shell svnversion -n $(topdir))
+SVNREV = $(shell svnversion -n $(topdir) 2>/dev/null)
CFLAGS += "-DSVNREV=\"$(SVNREV)\""
CXXFLAGS += "-DSVNREV=\"$(SVNREV)\""
@@ -472,6 +472,7 @@
serialization/tokenizer.cpp \
zipios++/xcoll.cpp
+if USESVN
# Until game_config.cpp is removed, this will be needed to ensure that the
# SVNVER constant gets updated correctly. If and when that definition is
# moved elsewhere, this dependency must follow it.
@@ -482,6 +483,7 @@
if [ x"$(SVNREV)" != x`cat revision-stamp 2>/dev/null` ]; then echo -n
$(SVNREV) >revision-stamp; fi
FORCE:
+endif
AM_CXXFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@
@PYTHON_CFLAGS@ -DWESNOTH_PATH=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(LOCALEDIR)\"
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) -DFIFODIR=\"$(fifodir)\"
Modified: trunk/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=17094&r1=17093&r2=17094&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Wed Apr 25 18:48:33 2007
@@ -1931,9 +1931,9 @@
try {
std::cerr << "Battle for Wesnoth v" << VERSION
-#if defined(SVNREV) and defined(DO_DISPLAY_REVISION)
+#if defined(SVNREV) && defined(DO_DISPLAY_REVISION)
<< " (" << game_config::svnrev << ")"
-#endif /* defined(SVNREV) and defined(DO_DISPLAY_REVISION) */
+#endif /* defined(SVNREV) && defined(DO_DISPLAY_REVISION) */
<< '\n';
time_t t = time(NULL);
std::cerr << "Started on " << ctime(&t) << "\n";
Modified: trunk/src/titlescreen.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/titlescreen.cpp?rev=17094&r1=17093&r2=17094&view=diff
==============================================================================
--- trunk/src/titlescreen.cpp (original)
+++ trunk/src/titlescreen.cpp Wed Apr 25 18:48:33 2007
@@ -232,9 +232,9 @@
const std::string& version_str = _("Version") + std::string(" ") +
game_config::version
-#if defined(SVNREV) and defined(DO_DISPLAY_REVISION)
+#if defined(SVNREV) && defined(DO_DISPLAY_REVISION)
+ " (" + game_config::svnrev + ")"
-#endif /* defined(SVNREV) and defined(DO_DISPLAY_REVISION) */
+#endif /* defined(SVNREV) && defined(DO_DISPLAY_REVISION) */
;
const SDL_Rect version_area = font::draw_text(NULL,screen_area(),
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
