diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2009-07-31 13:31:14 +0000 |
|---|---|---|
| committer | JazzyNico <JazzyNico@users.sourceforge.net> | 2009-07-31 13:31:14 +0000 |
| commit | 3725a58606e97506e00429ac48716ac16d524f2e (patch) | |
| tree | 850b1fa42977a190e5050b7d91ec062fc9246ecb | |
| parent | Fixing a paste mistake between Black hole and Black light (diff) | |
| download | inkscape-3725a58606e97506e00429ac48716ac16d524f2e.tar.gz inkscape-3725a58606e97506e00429ac48716ac16d524f2e.zip | |
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.
(bzr r8371)
| -rw-r--r-- | build.xml | 2 | ||||
| -rw-r--r-- | buildtool.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -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; |