This was due to the addition of the version number to inkscape-version.cpp. I had an obscure bug to do with !if not being "noticed" inside the !ifexist macro and so the !endif wasn't seen as closing it, when the whole block of code was evaluated to false by a !if (because it *found* the revno in inkscape-version.cpp). This has been resolved now in r9175 (I swapped the !if and the ${!ifexist} so that the error won't happen).
2010/3/9 Uwe Schöler <mail@...2227...>
Hi,
with the changes in build.xml the revision number is in the spash screen. GREAT!
Chris Morgans changes in R9166 are not working. In inkscape.nsi is an error in row 169 (probably we don't need the third '!endif') and the script stops. If i delete the row, the script is building the exe file, named inkscape-0.47+devel-1.exe
Sincerely,
UweSch
Am 08.03.2010 22:14, schrieb Uwe Schöler:
Hi Nicolas,
after building btool again it's working fine and now we have a revision number in the Splash screen on windows. Thank you very much. People can download the 9166 on modevia tomorrow :)
Sincerely,
UweSch
Am 08.03.2010 20:15, schrieb Nicolas Dufour:
Hi Chris, hi all,
Important note to all Windows users: buildtool.cpp and build.xml have
changed. Please rebuild btool (g++ buildtool.cpp -o btool).
De : Chris Morgan <chris.morganiser@...400...> On Sun, Feb 28, 2010 at 11:51 PM, Nicolas Dufour <nicoduf@...48...>
wrote:
Since "bzr revno" gives the rev number directly, it may be easier to
reuse the commented part (callled "safe way") instead of the currently uncommented one ("universal way"). But I'm not a C++ expert, and there may be a good reason why we used the "universal way" with SVN. Does someone remember?
Most users on Windows will have TortoiseBzr instead of bzr. While
TortoiseBzr includes bzr.exe (as I recall it), it's unlikely to be in the PATH.
In the Inkscape installer I do this: !searchparse /noerrors /file .....bzr\branch\last-revision ""
BZR_REVISION " "Viz, it takes the bit before the space in .bzr/branch/last-revision. Nice and simple to parse.
It doesn't work if you have a checkout (there's no last-revision at all
in this case!).
I've committed a new btool version which uses "bzr revno" in rev.9166.
It's only a temporary fix, and it needs some cleanup (all the old svn stuff is kept), but at least it works for bzr checkout users (and don't prevent inkscape from compiling if bzr is not in the path).
Fell free to improve it. Maybe by checking .bzr\branch\last-revision
first and use "bzr revno" if it fails?
Regards.
Nicolas
Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Thanks,
Chris Morgan <chris.morganiser@...400...>
I'm good at making two things: mistakes and enemies.