From: JazzyNico <JazzyNico@users.sourceforge.net>
Date: Fri, 31 Jul 2009 13:31:14 +0000 (+0000)
Subject: Fix for LP #386256 (Inkscape-0.47pre0 does not build on win32).
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2753f97adb8be522b4b75a9e7bde2bbdeb806440;p=inkscape.git

Fix for LP #386256 (Inkscape-0.47pre0 does not build on win32).
Returns an empty string instead of false when looking for svn.revision when the snapshot doesn't contain an svn dir.
---

diff --git a/build.xml b/build.xml
index 62eda3aaa..3d21a6740 100644
--- a/build.xml
+++ b/build.xml
@@ -103,7 +103,7 @@
           
     <makefile file="${src}/inkscape-version.cpp">
         namespace Inkscape {
-            char const *version_string = "${version} r${svn.revision}";
+            char const *version_string = "${version} ${svn.revision}";
         }
     </makefile>
     <makefile file="config.h">
diff --git a/buildtool.cpp b/buildtool.cpp
index 4ba7ccfe9..538a6faa5 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -4704,6 +4704,12 @@ bool MakeBase::lookupProperty(const String &propertyName, String &result)
         varname = varname.substr(svnPrefix.size());
         String val;
         SvnInfo svnInfo;
+        if (varname == "revision")
+	    {
+            if (!svnInfo.query(varname, val))
+                return "";
+            result = "r"+val;
+            }
         if (!svnInfo.query(varname, val))
             return false;
         result = val;