[PATCH 1 of 2] iss: take version from iscc command line

[Steve Borho]

On Sun, Aug 16, 2009 at 10:47 PM, Steve Borho<steve at borho.org> wrote:
> # HG changeset patch
> # User Steve Borho <steve at borho.org>
> # Date 1250475828 18000
> # Node ID 8d86ff46efdfb7268f2c02d0f205a1a98bb83add
> # Parent  3ac42ca1f3e617438c9fa3732678583ec6888bf6
> iss: take version from iscc command line
>
> Requires InnoSetup Preprocessor

This patch has a minor quoting issue, please do not push it.
If no one objects to the changes in the patches, I'll push them
to crew-stable tomorrow.  Once they make it to hg-stable I can
start doing automated nightly builds.

> diff -r 3ac42ca1f3e6 -r 8d86ff46efdf contrib/win32/mercurial.iss
> --- a/contrib/win32/mercurial.iss       Fri Aug 14 11:18:23 2009 +0200
> +++ b/contrib/win32/mercurial.iss       Sun Aug 16 21:23:48 2009 -0500
> @@ -1,9 +1,14 @@
>  ; Script generated by the Inno Setup Script Wizard.
>  ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
> +
> +#ifndef VERSION
> +#define VERSION snapshot
> +#endif
> +
>  [Setup]
>  AppCopyright=Copyright 2005-2009 Matt Mackall and others
>  AppName=Mercurial
> -AppVerName=Mercurial snapshot
> +AppVerName=Mercurial {#VERSION}
>  InfoAfterFile=contrib/win32/postinstall.txt
>  LicenseFile=COPYING
>  ShowLanguageDialog=yes
> @@ -13,7 +18,7 @@
>  AppUpdatesURL=http://mercurial.selenic.com/
>  AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
>  AppContact=mercurial at selenic.com
> -OutputBaseFilename=Mercurial-snapshot
> +OutputBaseFilename=Mercurial-{#VERSION}
>  DefaultDirName={pf}\Mercurial
>  SourceDir=..\..
>  VersionInfoDescription=Mercurial distributed SCM
> diff -r 3ac42ca1f3e6 -r 8d86ff46efdf contrib/win32/win32-build.txt
> --- a/contrib/win32/win32-build.txt     Fri Aug 14 11:18:23 2009 +0200
> +++ b/contrib/win32/win32-build.txt     Sun Aug 16 21:23:48 2009 -0500
> @@ -25,7 +25,10 @@
>       http://gnuwin32.sourceforge.net/packages/gettext.htm
>
>   Inno Setup
> -      http://www.jrsoftware.org/isinfo.php
> +      http://www.jrsoftware.org/isdl.php#qsp
> +
> +      Get ispack-5.3.4.exe, which includes Inno Setup Preprocessor,
> +      which you must install.
>
>   ISTool - optional
>       http://www.istool.org/default.aspx/
> @@ -91,9 +94,11 @@
>
>  Otherwise you run the Inno Setup compiler.  Assuming it's on the path you run:
>
> -  iscc contrib\win32\mercurial.iss
> +  iscc contrib\win32\mercurial.iss /DVERSION=foo
>
> -The actual installer will be in the C:\hg\hg-release\Output directory.
> +Where 'foo' is the version number you would like to see in the
> +'Add/Remove Applications' tool.  The installer will output into
> +an Output/ directory in your repository.
>
>  To automate the steps above you may want to create a batchfile based on the
>  following:
> @@ -104,6 +109,6 @@
>   cd doc
>   mingw32-make ASCIIDOC=asciidoc.bat html
>   cd ..
> -  iscc contrib\win32\mercurial.iss
> +  iscc contrib\win32\mercurial.iss /DVERSION=snapshot
>
>  and run it from the root of the hg repository (c:\hg\hg-release).
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>

--
Steve Borho