mail[Wesnoth-commits] r24731 - in /trunk: ./ data/tools/ src/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 17, 2008 - 09:46:
Author: esr
Date: Mon Mar 17 09:46:37 2008
New Revision: 24731

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24731&view=rev
Log:
Remove --display-revision switch, always build revision-stamp file.
Implement a :version debug command that shows the build version,
including the SVN revision from the build-stamp file.

Modified:
    trunk/INSTALL
    trunk/Makefile.am
    trunk/configure.ac
    trunk/data/tools/wmllint
    trunk/src/Makefile.am
    trunk/src/game_config.cpp
    trunk/src/game_display.cpp
    trunk/src/menu_events.cpp

Modified: trunk/INSTALL
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/INSTALL?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL Mon Mar 17 09:46:37 2008
@@ -62,11 +62,6 @@
 If you want to build wesnoth_editor too add the --enable-editor
 configure option.
 
-The --enable-display-revision option enables code that shows the SVN
-revision number on the main screen -- useful for detecting old builds
-you might happen to have in your path, but probably not what you want
-in a production release.
-
 If you see lots of messages like "Type 'svnversion --help' for usage.",
 you have a Subversion client installed but it is not implementing the 
 -n option of svnversion. Time to update it.

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/Makefile.am?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Mon Mar 17 09:46:37 2008
@@ -1,7 +1,3 @@
-if USESVN
-SVNREV = $(shell svnversion -n .)
-endif
-
 ISUBDIRS = icons
 SUBDIRS = po m4 src doc $(ISUBDIRS)
 pkgdatadir=$(datadir)/@DATADIR@

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/configure.ac?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Mar 17 09:46:37 2008
@@ -313,12 +313,6 @@
                [internaldata=$enableval],
                [internaldata=no])
 
-AC_ARG_ENABLE([display-revision],
-              AS_HELP_STRING([--enable-display-revision], [enable svn 
revision display]),
-             [svnrev=$enableval],
-             [svnrev=no])
-
-
 if test "x$game" = "xno"
 then
        python=no
@@ -348,7 +342,6 @@
 AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
 AM_CONDITIONAL([TESTS], [test x$tests = 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/data/tools/wmllint
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Mon Mar 17 09:46:37 2008
@@ -2135,7 +2135,7 @@
             # Now, inside objects...
             if under("object") and "description" not in tagstack[-1][1]:
                 transformed = re.sub(r"user_description\s*=", 
"description=", line)
-            # Alas, WML variable references cannod be converted so
+            # Alas, WML variable references cannot be converted so
             # automatically.
             if ".description" in line: 
                 print '"%s", line %d: .description may need hand fixup' % \

Modified: trunk/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/Makefile.am?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Mon Mar 17 09:46:37 2008
@@ -1,8 +1,6 @@
-if USESVN
 SVNREV = $(shell svnversion -n $(topdir) 2>/dev/null)
 CFLAGS += "-DSVNREV=\"$(SVNREV)\""
 CXXFLAGS += "-DSVNREV=\"$(SVNREV)\""
-endif
 
 AUTOMAKE_OPTIONS = subdir-objects
 
@@ -440,7 +438,6 @@
        widgets/widget.cpp \
        wml_exception.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.
@@ -451,7 +448,6 @@
        if [ x"$(SVNREV)" != x`cat revision-stamp 2>/dev/null` ]; then echo 
-n $(SVNREV) >revision-stamp; fi
 
 FORCE:
-endif
 
 AM_CXXFLAGS = -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@  
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
        -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) -DFIFODIR=\"$(fifodir)\"

Modified: trunk/src/game_config.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_config.cpp?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/src/game_config.cpp (original)
+++ trunk/src/game_config.cpp Mon Mar 17 09:46:37 2008
@@ -43,7 +43,7 @@
 #ifdef SVNREV
        const std::string svnrev = SVNREV;
 #else
-       const std::string svnrev = "";
+       const std::string svnrev = "unknown";
 #endif
        bool debug = false, editor = false, ignore_replay_errors = false, 
mp_debug = false, exit_at_end = false, no_delay = false, disable_autosave = 
false;
 

Modified: trunk/src/game_display.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_display.cpp?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/src/game_display.cpp (original)
+++ trunk/src/game_display.cpp Mon Mar 17 09:46:37 2008
@@ -1249,7 +1249,8 @@
                        message_colour = speaker_colour;
                        message_str << " ";
                } else {
-                       str << "<" << speaker << ">";
+                       if (!speaker.empty())
+                               str << "<" << speaker << ">";
                        message_str << msg;
                }
        } else {
@@ -1258,7 +1259,8 @@
                        message_colour = speaker_colour;
                        message_str << " ";
                } else {
-                       str << "*" << speaker << "*";
+                       if (!speaker.empty())
+                               str << "*" << speaker << "*";
                        message_str << msg;
                }
        }

Modified: trunk/src/menu_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=24731&r1=24730&r2=24731&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Mon Mar 17 09:46:37 2008
@@ -2319,6 +2319,11 @@
                } else if(game_config::debug && (cmd == "throw" || cmd == 
"fire")) {
                        game_events::fire(data);
                        gui_->redraw_everything();
+               } else if(cmd == "version") {
+                       add_chat_message(time(NULL), "", 0, 
+                                        game_config::version
+                                        + (game_config::svnrev.empty() ? "" :
+                                           " (" + game_config::svnrev + 
")"));
                }
        }
 




Related Messages


Powered by MHonArc, Updated Mon Mar 17 10:41:50 2008