[ScryMUD] SVN Commit Info r716 - trunk/mud/grrmud/server

[scrymud at wanfear.com]

Author: eroper
Date: 2004-11-27 20:43:13 -0800 (Sat, 27 Nov 2004)
New Revision: 716

Modified:
   trunk/mud/grrmud/server/BuildInfo.h
   trunk/mud/grrmud/server/Makefile
   trunk/mud/grrmud/server/classes.cc
   trunk/mud/grrmud/server/command5.cc
   trunk/mud/grrmud/server/grrmud.cc
Log:
ported 713:715 from the version-2-1 branch.


Modified: trunk/mud/grrmud/server/BuildInfo.h
===================================================================
--- trunk/mud/grrmud/server/BuildInfo.h	2004-11-28 04:12:04 UTC (rev 715)
+++ trunk/mud/grrmud/server/BuildInfo.h	2004-11-28 04:43:13 UTC (rev 716)
@@ -33,6 +33,7 @@
    static const char* getBuilder(); // $USER that built it
    static const char* getVersion(); // Code version, according to MakeInclude
    static const char* getBuildDate(); // as shown by `date`
+   static const char* getRevision(); // Code revision, according to Subversion
 };
 
 

Modified: trunk/mud/grrmud/server/Makefile
===================================================================
--- trunk/mud/grrmud/server/Makefile	2004-11-28 04:12:04 UTC (rev 715)
+++ trunk/mud/grrmud/server/Makefile	2004-11-28 04:43:13 UTC (rev 716)
@@ -69,7 +69,10 @@
 	$(CC) $(CCFLAGS) \
 	-c $<
 
-BuildInfo.cc: $(SRCS) Makefile BuildInfo.prefix
+Subversion-Revision:
+	svn info |grep Revision |awk '{print $$2}' >Subversion-Revision
+
+BuildInfo.cc: $(SRCS) Makefile BuildInfo.prefix Subversion-Revision
 	cat BuildInfo.prefix > BuildInfo.cc
 	echo "const char* BuildInfo::getBuildMachine() { return \"`uname -mrspn`\"; }" >> BuildInfo.cc
 	echo "" >> BuildInfo.cc
@@ -78,6 +81,8 @@
 	echo "const char* BuildInfo::getBuildDate() { return \"`date`\"; }" >> BuildInfo.cc
 	echo "" >> BuildInfo.cc
 	echo "const char* BuildInfo::getVersion() { return \"${SCRY_VERSION}\"; }" >> BuildInfo.cc
+	echo "" >> BuildInfo.cc
+	echo "const char* BuildInfo::getRevision() { return \"`cat Subversion-Revision`\"; }" >> BuildInfo.cc
 
 
 parse_gen.cc: ${CODE_GEN_TARG} ${GEN_SPEC}

Modified: trunk/mud/grrmud/server/classes.cc
===================================================================
--- trunk/mud/grrmud/server/classes.cc	2004-11-28 04:12:04 UTC (rev 715)
+++ trunk/mud/grrmud/server/classes.cc	2004-11-28 04:43:13 UTC (rev 716)
@@ -95,13 +95,14 @@
             break;
          }            
          case 'v': {
-            cout << "ScryMUD version: " << BuildInfo::getVersion() << " built on: "
-                 << BuildInfo::getBuildDate() << "\nby: " << BuildInfo::getBuilder()
-                 << " on machine: " << BuildInfo::getBuildMachine() << endl;
-            do_shutdown = TRUE;
-            exit(0);
-            break;
-         }
+           cout << "ScryMUD version: " << BuildInfo::getVersion() << " (" <<
+                BuildInfo::getRevision() << ") built on: "
+                << BuildInfo::getBuildDate() << "\nby: " << BuildInfo::getBuilder()
+                << " on machine: " << BuildInfo::getBuildMachine() << endl;
+           do_shutdown = TRUE;
+           exit(0);
+           break;
+                   }
          case 'h':
          case 'u': {
                       cout << "ScryMUD Usage:\n"

Modified: trunk/mud/grrmud/server/command5.cc
===================================================================
--- trunk/mud/grrmud/server/command5.cc	2004-11-28 04:12:04 UTC (rev 715)
+++ trunk/mud/grrmud/server/command5.cc	2004-11-28 04:43:13 UTC (rev 716)
@@ -2477,12 +2477,13 @@
       return 0;
    }
 
-   Sprintf(buf, "ScryMUD version: %s\n"
+   Sprintf(buf, "ScryMUD version: %s (%s)\n"
          "Built on:        %s\n"
          "On Machine:      %s\n"
          "By:              %s\n\n",
-         BuildInfo::getVersion(), BuildInfo::getBuildDate(),
-         BuildInfo::getBuildMachine(), BuildInfo::getBuilder());
+         BuildInfo::getVersion(), BuildInfo::getRevision(),
+         BuildInfo::getBuildDate(), BuildInfo::getBuildMachine(),
+         BuildInfo::getBuilder());
    pc.show(buf);
 
    Sprintf(buf, "Listening on port: %i\n", config.port);

Modified: trunk/mud/grrmud/server/grrmud.cc
===================================================================
--- trunk/mud/grrmud/server/grrmud.cc	2004-11-28 04:12:04 UTC (rev 715)
+++ trunk/mud/grrmud/server/grrmud.cc	2004-11-28 04:43:13 UTC (rev 716)
@@ -526,7 +526,8 @@
 
    BOOT_TIME = time(NULL);
 
-   cout << "ScryMUD version: " << BuildInfo::getVersion() << endl;
+   cout << "ScryMUD version: " << BuildInfo::getVersion() 
+      << " (" << BuildInfo::getRevision() << ")" << endl;
    cout << "Built on:        " << BuildInfo::getBuildDate() << endl;
    cout << "On machine:      " << BuildInfo::getBuildMachine() << endl;
    cout << "By:              " << BuildInfo::getBuilder() << endl << endl;