Backported automatic svn revision handling from 3.0

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3991 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 23 insertions, 12 deletions

diff --git a/SConstruct b/SConstruct
index 7bf8d61aff..6e8b16e41e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -262,16 +262,16 @@ def create_stored_revision (target = None, source = None, env = None):
     if os.path.exists('.svn'):    
         rev = fetch_svn_revision ('.');
         try:
-            text  = "#ifndef __ardour_svn_revision_h__\n"
-            text += "#define __ardour_svn_revision_h__\n"
-            text += "static const char* ardour_svn_revision = \"" + rev + "\";\n";
-            text += "#endif\n"
-            print '============> writing svn revision info to svn_revision.h\n'
-            o = file ('svn_revision.h', 'w')
+            text  = "#include <ardour/svn_revision.h>\n"
+            text += "namespace ARDOUR {\n";
+            text += "extern const char* svn_revision = \"" + rev + "\";\n";
+            text += "}\n";
+            print '============> writing svn revision info to libs/ardour/svn_revision.cc\n'
+            o = file ('libs/ardour/svn_revision.cc', 'w')
             o.write (text)
             o.close ()
         except IOError:
-            print "Could not open svn_revision.h for writing\n"
+            print "Could not open libs/ardour/svn_revision.cc for writing\n"
             sys.exit (-1)
     else:
         print "You cannot use \"scons revision\" on without using a checked out"
@@ -1373,6 +1373,12 @@ env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE'
 env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE']))))
 
 #
+# Update revision info before going into subdirs
+#
+
+create_stored_revision()
+
+#
 # the subdirs
 #
 
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 44b82882dd..a2005e0063 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -25,13 +25,13 @@
 #include <ctime>
 #include <cstdlib>
 
+#include <ardour/svn_revision.h>
 #include <ardour/ardour.h>
 #include <ardour/version.h>
 
 #include "utils.h"
 #include "version.h"
 
-#include "svn_revision.h"
 #include "about.h"
 #include "rgb_macros.h"
 //#include "ardour_ui.h"
@@ -207,7 +207,7 @@ About::About ()
 	set_website_label (_("visit http://www.ardour.org/"));
 	set_version ((string_compose(_("%1\n(built from revision %2)"),
 				     VERSIONSTRING, 
-				     ardour_svn_revision)));
+				     svn_revision)));
 	
 
 #ifdef WITH_PAYMENT_OPTIONS
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index c4b9b9a897..468ad21bd0 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -31,6 +31,7 @@
 
 #include <jack/jack.h>
 
+#include <ardour/svn_revision.h>
 #include <ardour/version.h>
 #include <ardour/ardour.h>
 #include <ardour/audioengine.h>
@@ -39,7 +40,6 @@
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
-#include "svn_revision.h"
 #include "version.h"
 #include "ardour_ui.h"
 #include "opts.h"
@@ -292,7 +292,7 @@ int main (int argc, char* argv[])
 	cout << _("Ardour/GTK ") 
 	     << VERSIONSTRING
 	     << _("\n   (built using ")
-	     << ardour_svn_revision
+	     << svn_revision
 #ifdef __GNUC__
 	     << _(" and GCC version ") << __VERSION__ 
 #endif
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 261ed4c697..1610130327 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -99,6 +99,7 @@ sndfilesource.cc
 sndfileimportable.cc
 source.cc
 source_factory.cc
+svn_revision.cc
 tempo.cc
 track.cc
 transient_detector.cc
diff --git a/svn_revision.h b/libs/ardour/ardour/svn_revision.h
index 67781c0015..6c11d55e50 100644
--- a/svn_revision.h
+++ b/libs/ardour/ardour/svn_revision.h
@@ -1,4 +1,8 @@
 #ifndef __ardour_svn_revision_h__
 #define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "3980";
+
+namespace ARDOUR {
+	extern const char* svn_revision;
+}
+
 #endif