ekiga r6960 - in trunk: . src src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Sat Sep 13 19:35:50 2008
New Revision: 6960
URL: http://svn.gnome.org/viewvc/ekiga?rev=6960&view=rev

Log:
Embed the svn revision in the build.
Display it via PTRACE.


Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/gui/main.cpp

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Sep 13 19:35:50 2008
@@ -160,6 +160,10 @@
 
 endif
 
+SVN_REVISION=$(shell head ../.svn/entries -n11 2>/dev/null | tail -n1)
+CACHED_REVISION=$(shell cat revision.h 2>/dev/null | cut -c24-)
+$(shell if test "x$(SVN_REVISION)" != "x$(CACHED_REVISION)"; then echo "#define EKIGA_REVISION $(SVN_REVISION)" > revision.h; fi)
+
 AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
 AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)
 

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sat Sep 13 19:35:50 2008
@@ -35,6 +35,7 @@
  *                          build the main window.
  */
 
+#include "revision.h"
 
 #include "config.h"
 
@@ -4574,10 +4575,6 @@
 #endif
 
   /* Globals */
-#ifdef HAVE_ESD
-  setenv ("ESD_NO_SPAWN", "1", 1);
-#endif
-
 #ifndef WIN32
   if (!XInitThreads ())
     exit (1);
@@ -4676,6 +4673,9 @@
     PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL,
 			PTrace::Timestamp | PTrace::Thread
 			| PTrace::Blocks | PTrace::DateAndTime);
+#ifdef EKIGA_REVISION
+  PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION);
+#endif
 
 #ifdef HAVE_DBUS
   if (!ekiga_dbus_claim_ownership ()) {