Final changes to install a 64 bit version of GpgEX.
authorWerner Koch <wk@gnupg.org>
Mon, 1 Jul 2013 08:47:43 +0000 (10:47 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 1 Jul 2013 08:47:43 +0000 (10:47 +0200)
commit5ad82fffeb01881cf617243e1cb6250c24811380
treef82a1798067ae7c38693ed8169ed394dc6a700a8
parent55ab939256f1bfacf1499138b0cdee0921ad4b78
Final changes to install a 64 bit version of GpgEX.

* configure.ac: Drop unneeded dependencies for the 64 bit pekes.
Re-add those tools as regular SPKG modules.

* src/Makefile.am (gpg4win_pkg_libgpg_error_ex_configure)
(gpg4win_pkg_libassuan_ex_configure): Add to build static libraries.
* src/gpg4win.mk.in (ex_ipdir): New.
(stamps/stamp-directories, stamps/stamp-$(1)-ex-05-stow)
(clean-ex-$(1)): Use ex_ipdir.

* src/inst-gettext.nsi, src/uninst-gettext.nsi: Change name of the
installed DLL.

* src/inst-glib.nsi: Move installation of charset.alias to ..
* src/inst-libiconv.nsi: here.

* src/inst-libiconv.nsi, src/uninst-libiconv.nsi: Adjust name of
libiconv.dll but also install under the old name.

* src/installer.nsi: Include x64.nsh.
* src/inst-gpgex.nsi, src/uninst-gpgex.nsi: On 64 bit boxes, install
also the 64 bit version.

* src/gpg4win.nsi: Add RequestExecutionLevel directive.

* src/gpg4win.nsi: Use /SOLID for the compressor settings.
--

Some of the above changes are merely to avoid surprises regarding the
64 bit versions of the modules which used to be installed under
install-ex/ but stowed from the regular install/pkgs directory.

Using /SOLID shrinks the installer considerably (16 to 13 MB for the
light installer).

The use of RequestExecutionLevel is not really needed because Windows
seems to know about NSIS installer but it is nevertheless good style
to correctly mark the installer.
13 files changed:
configure.ac
src/Makefile.am
src/gpg4win-src.nsi
src/gpg4win.mk.in
src/gpg4win.nsi
src/inst-gettext.nsi
src/inst-glib.nsi
src/inst-gpgex.nsi
src/inst-libiconv.nsi
src/installer.nsi
src/uninst-gettext.nsi
src/uninst-gpgex.nsi
src/uninst-libiconv.nsi