2007-07-03 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Mon, 2 Jul 2007 23:42:20 +0000 (23:42 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Mon, 2 Jul 2007 23:42:20 +0000 (23:42 +0000)
* configure.ac: Add dirmngr.
* include/config.nsi.in: Add dirmngr.
* src/Makefile.am (gpg4win_spkgs): Add dirmngr.
(gpg4win_pkg_dirmngr_configure): New variable.
* src/inst-dirmngr.nsi, src/uninst-dirmngr.nsi: New files.
* src/inst-sections.nsi [HAVE_PKG_DIRMNGR]: Include installer
and uninstaller snippet for dirmngr.

ChangeLog
configure.ac
include/config.nsi.in
src/Makefile.am
src/inst-dirmngr.nsi [new file with mode: 0644]
src/inst-sections.nsi
src/uninst-dirmngr.nsi [new file with mode: 0644]

index 93ad3f1..851ce9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-07-03  Marcus Brinkmann  <marcus@g10code.de>
 
+       * configure.ac: Add dirmngr.
+       * include/config.nsi.in: Add dirmngr.
+       * src/Makefile.am (gpg4win_spkgs): Add dirmngr.
+       (gpg4win_pkg_dirmngr_configure): New variable.
+       * src/inst-dirmngr.nsi, src/uninst-dirmngr.nsi: New files.
+       * src/inst-sections.nsi [HAVE_PKG_DIRMNGR]: Include installer
+       and uninstaller snippet for dirmngr.
+
        * Makefile.am (EXTRA_DIST): Add
        patches/claws-mail-2.10.0/01-w32-logo.patch,
        patches/claws-mail-2.10.0/02-w32-icon.patch,
@@ -34,7 +42,7 @@
        * src/Makefile.am (gpg4win_spkgs): Add claws-mail.
        (gpg4win_pkg_claws_mail_configure): New variable.
        * src/inst-claws-mail.nsi, src/uninst-claws-mail.nsi: New files.
-       * src/inst-sections.nsi [HAVE_PKG_CLAws_MAIL]: Include installer
+       * src/inst-sections.nsi [HAVE_PKG_CLAWS_MAIL]: Include installer
        and uninstaller snippet for claws-mail, handle claws-mail
        dependencies and add a menu item for it.
 
index 44be9ba..ca6bc9e 100644 (file)
@@ -186,6 +186,7 @@ GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([libgcrypt], [libgpg-error])
 GPG4WIN_SPKG([libksba], [libgpg-error])
 GPG4WIN_SPKG([libassuan], [w32pth])
+GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba])
 GPG4WIN_SPKG([w32pth])
 GPG4WIN_SPKG([pinentry], [libiconv])
 GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
index 183fb4d..5d3e440 100644 (file)
 !define gpg4win_pkg_libksba @gpg4win_pkg_libksba@
 !define gpg4win_pkg_libksba_version @gpg4win_pkg_libksba_version@
 
+@HAVE_PKG_DIRMNGR@
+!define gpg4win_pkg_dirmngr @gpg4win_pkg_dirmngr@
+!define gpg4win_pkg_dirmngr_version @gpg4win_pkg_dirmngr_version@
+
 @HAVE_PKG_GPGME@
 !define gpg4win_pkg_gpgme @gpg4win_pkg_gpgme@
 !define gpg4win_pkg_gpgme_version @gpg4win_pkg_gpgme_version@
index 25ed38d..13306e8 100644 (file)
@@ -32,7 +32,7 @@ CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
 # Supported source packages.
 gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
                claws-mail gnupg2 pinentry libassuan libksba \
-               libgcrypt w32pth
+               libgcrypt dirmngr w32pth
 
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
@@ -85,6 +85,12 @@ gpg4win_pkg_libksba_configure = --silent \
 gpg4win_pkg_libgcrypt_configure = --silent \
   --with-gpg-error-prefix=$(idir)
 
+gpg4win_pkg_dirmngr_configure = \
+  --with-gpg-error-prefix=$(idir) \
+  --with-ksba-prefix=$(idir) \
+  --with-libgcrypt-prefix=$(idir) \
+  --with-libassuan-prefix=$(idir)
+
 gpg4win_pkg_gnupg2_configure = \
   --with-gpg-error-prefix=$(idir) \
   --with-ksba-prefix=$(idir) \
diff --git a/src/inst-dirmngr.nsi b/src/inst-dirmngr.nsi
new file mode 100644 (file)
index 0000000..fbdffe9
--- /dev/null
@@ -0,0 +1,40 @@
+# inst-dirmngr.nsi - Installer snippet.            -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+# 
+# This file is part of Gpg4win.
+# 
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/dirmngr-${gpg4win_pkg_dirmngr_version}
+
+!ifdef DEBUG
+Section "dirmngr" SEC_dirmngr
+!else
+Section "-dirmngr" SEC_dirmngr
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_dirmngr}"
+!else
+  File "${prefix}/bin/dirmngr.exe"
+
+!endif
+SectionEnd
+
index df01609..d52751f 100644 (file)
@@ -62,6 +62,9 @@
 !ifdef HAVE_PKG_REGEX
 !include "inst-regex.nsi"
 !endif
+!ifdef HAVE_PKG_DIRMNGR
+!include "inst-dirmngr.nsi"
+!endif
 !ifdef HAVE_PKG_PTHREADS_W32
 !include "inst-pthreads-w32.nsi"
 !endif
 #!ifdef HAVE_PKG_EUDORAGPG
 #!include "uninst-eudoragpg.nsi"
 #!endif
-!ifdef HAVE_PKG_SYLPHEED_CLAWS
-!include "uninst-sylpheed-claws.nsi"
-!endif
 !ifdef HAVE_PKG_CLAWS_MAIL
 !include "uninst-claws-mail.nsi"
 !endif
+!ifdef HAVE_PKG_SYLPHEED_CLAWS
+!include "uninst-sylpheed-claws.nsi"
+!endif
 !ifdef HAVE_PKG_GPGEE
 !include "uninst-gpgee.nsi"
 !endif
 !ifdef HAVE_PKG_PTHREADS_W32
 !include "uninst-pthreads-w32.nsi"
 !endif
+!ifdef HAVE_PKG_DIRMNGR
+!include "uninst-dirmngr.nsi"
+!endif
 !ifdef HAVE_PKG_REGEX
 !include "uninst-regex.nsi"
 !endif
@@ -261,6 +267,9 @@ Function CalcDepends
 !ifdef HAVE_PKG_REGEX
   !insertmacro UnselectSection ${SEC_regex}
 !endif
+!ifdef HAVE_PKG_DIRMNGR
+  !insertmacro UnselectSection ${SEC_dirmngr}
+!endif
 !ifdef HAVE_PKG_PTHREADS_W32
   !insertmacro UnselectSection ${SEC_pthreads_w32}
 !endif
@@ -446,6 +455,16 @@ Function CalcDepends
   skip_libpng:
 !endif
 
+!ifdef HAVE_PKG_DIRMNGR
+  !insertmacro SectionFlagIsSet ${SEC_dirmngr} ${SF_SELECTED} have_dirmngr skip_dirmngr
+  have_dirmngr:
+  !insertmacro SelectSection ${SEC_libgcrypt}
+  !insertmacro SelectSection ${SEC_libksba}
+  !insertmacro SelectSection ${SEC_libassuan}
+  !insertmacro SelectSection ${SEC_libgpg_error}
+  skip_dirmngr:
+!endif
+
 !ifdef HAVE_PKG_GLIB
   !insertmacro SectionFlagIsSet ${SEC_glib} \
                ${SF_SELECTED} have_glib skip_glib
diff --git a/src/uninst-dirmngr.nsi b/src/uninst-dirmngr.nsi
new file mode 100644 (file)
index 0000000..90a1d72
--- /dev/null
@@ -0,0 +1,37 @@
+# uninst-dirmngr.nsi - Uninstaller snippet.        -*- coding: latin-1; -*-
+# Copyright (C) 2007 g10 Code GmbH
+# 
+# This file is part of Gpg4win.
+# 
+# Gpg4win is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# Gpg4win is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/dirmngr-${gpg4win_pkg_dirmngr_version}
+
+
+# Uninstaller section.
+Section "-un.dirmngr"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_dirmngr}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\dirmngr.exe"
+
+!endif
+SectionEnd