diff options
| author | Chris Morgan <chris.morganiser@gmail.com> | 2010-06-22 10:04:58 +0000 |
|---|---|---|
| committer | Chris Morgan <chris.morganiser@gmail.com> | 2010-06-22 10:04:58 +0000 |
| commit | 8164b0b73b5a502943e90d49d2d40ecbe4f78184 (patch) | |
| tree | 24ce8c051b9e9c9b8222fe0f7534dd59869efd4b /packaging | |
| parent | Put missing files for packaging/win32 into Makefile.am. (diff) | |
| download | inkscape-8164b0b73b5a502943e90d49d2d40ecbe4f78184.tar.gz inkscape-8164b0b73b5a502943e90d49d2d40ecbe4f78184.zip | |
Win32 installer: fixes for issues discovered in 0.48pre1.
(bzr r9523)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/win32/inkscape.nsi | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 5ceb0d592..28723b436 100755 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -179,6 +179,13 @@ ${!ifexist} ..\..\.bzr\branch\last-revision !if `${BZR_REVISION}` == `` !undef BZR_REVISION !endif +; For releases like 0.48pre1, throw away the preN. It's too tricky to deal with +; it properly so I'll leave it alone. It's just a pre-release, so it doesn't +; really matter. So long as the final release works properly. +!ifndef DEVEL + !undef INKSCAPE_VERSION_NUMBER + !searchparse /noerrors ${INKSCAPE_VERSION} "" INKSCAPE_VERSION_NUMBER "pre" PRE_NUMBER +!endif ; Handle display version number and complete X.X version numbers into X.X.X.X {{{3 !ifdef DEVEL & BZR_REVISION @@ -188,7 +195,13 @@ ${!ifexist} ..\..\.bzr\branch\last-revision ; Handle the installer revision number {{{4 !else ifdef RELEASE_REVISION ${!redef} FILENAME `${FILENAME}-${RELEASE_REVISION}` - ${!redef} BrandingText `${BrandingText}, revision ${BZR_REVISION}` + ; If we wanted the branding text to be like "Inkscape 0.48pre1 r9505" this'd do it. + ;!ifdef BZR_REVISION + ; ${!redef} BrandingText `${BrandingText} r${BZR_REVISION}` + ;!endif + !if `${RELEASE_REVISION}` != `1` + ${!redef} BrandingText `${BrandingText}, revision ${RELEASE_REVISION}` + !endif !define VERSION_X.X.X.X_REVISION ${RELEASE_REVISION} !else !define VERSION_X.X.X.X_REVISION 0 |