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 62eda3aaaa577c172e38c5687707ff4f4f6a518d..3d21a674052a514b39693281b2c4dcf4309079d2 100644 (file)
--- 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 4ba7ccfe9e8392f3026a78b1119e0019648a8ee4..538a6faa51c92a1619081bace877a7bc92082552 100644 (file)
--- 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;