Improved version reporting. Add SVN revision and custom status to

version string on Linux.

(bzr r7123)

6 files changed, 11 insertions, 7 deletions

diff --git a/src/extension/db.h b/src/extension/db.h
index 9505ac779..9d4fc77d3 100644
--- a/src/extension/db.h
+++ b/src/extension/db.h
@@ -17,6 +17,7 @@
 
 #include <map>
 #include <list>
+#include <cstring>
 
 #include "extension/extension.h"
 
diff --git a/src/extension/extension.h b/src/extension/extension.h
index 0129f4d74..48ca86cf7 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -22,7 +22,6 @@
 #include <gtkmm/table.h>
 #include <glibmm/ustring.h>
 #include "xml/repr.h"
-#include "document.h"
 #include "extension/extension-forward.h"
 
 /** The key that is used to identify that the I/O should be autodetected */
@@ -73,6 +72,8 @@
 #define INKSCAPE_EXTENSION_NS_NC "extension"
 #define INKSCAPE_EXTENSION_NS    "extension:"
 
+struct SPDocument;
+
 namespace Inkscape {
 namespace Extension {
 
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 9540b08e5..c331cac60 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -22,6 +22,8 @@
 #include "io/sys.h"
 #include "file.h"
 #include <unistd.h>
+#include <cstring>
+#include "document.h"
 
 #include <libxml/parser.h>
 #include <libxslt/transform.h>
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index 1de9bbfe0..f69186c71 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -49,7 +49,7 @@
 //#include "document.h"
 #include "style.h"
 //#include "sp-paint-server.h"
-#include "inkscape_version.h"
+#include "inkscape-version.h"
 
 //#include "libnrtype/FontFactory.h"
 //#include "libnrtype/font-instance.h"
@@ -172,7 +172,7 @@ PrintEmfWin32::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
 
     CHAR buff[1024];
     ZeroMemory(buff, sizeof(buff));
-    snprintf(buff, sizeof(buff)-1, "Inkscape %s (%s)", INKSCAPE_VERSION, __DATE__);
+    snprintf(buff, sizeof(buff)-1, "Inkscape %s (%s)", Inkscape::version_string, __DATE__);
     INT len = strlen(buff);
     CHAR *p1 = strrchr(ansi_uri, '\\');
     CHAR *p2 = strrchr(ansi_uri, '/');
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 69ee296e5..1c3ae9c2a 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -20,7 +20,7 @@
 #endif

 #include "javafx-out.h"

 #include <inkscape.h>

-#include <inkscape_version.h>

+#include <inkscape-version.h>

 #include <sp-path.h>

 #include <sp-linear-gradient.h>

 #include <sp-radial-gradient.h>

@@ -223,7 +223,7 @@ bool JavaFXOutput::doHeader()
     out("### This JavaFX document was generated by Inkscape\n");

     out("### http://www.inkscape.org\n");

     out("### Created: %s",   ctime(&tim));

-    out("### Version: %s\n", INKSCAPE_VERSION);

+    out("### Version: %s\n", Inkscape::version_string);

     out("#####################################################################\n");

     out("### NOTES:\n");

     out("### ============\n");

diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 6b8a5ce07..7dd9dcf5e 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -22,7 +22,7 @@
 #endif
 #include "pov-out.h"
 #include <inkscape.h>
-#include <inkscape_version.h>
+#include <inkscape-version.h>
 #include <sp-path.h>
 #include <style.h>
 #include <display/curve.h>
@@ -201,7 +201,7 @@ bool PovOutput::doHeader()
     out("### This PovRay document was generated by Inkscape\n");
     out("### http://www.inkscape.org\n");
     out("### Created: %s",   ctime(&tim));
-    out("### Version: %s\n", INKSCAPE_VERSION);
+    out("### Version: %s\n", Inkscape::version_string);
     out("#####################################################################\n");
     out("### NOTES:\n");
     out("### ============\n");