2007-08-30 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 30 Aug 2007 13:41:20 +0000 (13:41 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 30 Aug 2007 13:41:20 +0000 (13:41 +0000)
* configure.ac: Add gpgex.
* include/config.nsi.in: Add gpgex.
* src/Makefile.am (EXTRA_DIST): Add inst-gpgex.nsi and
uninst-gpgex.nsi.
(gpg4win_spkgs): Add gpgex.
(gpg4win_pkg_gpgex_configure): New variable.
* src/inst-sections.nsi: Add gpgex installer and uninstaller, as
well as description.
(CalcDefaults, CalcDepends): Add gpgex.

doc/
2007-08-30  Marcus Brinkmann  <marcus@g10code.de>

* manual/einsteiger.tex (Automatische Installation von Gpg4win),
README.de.txt, README.en.txt: Add inst_gpgex key.

ChangeLog
configure.ac
doc/ChangeLog
doc/README.de.txt
doc/README.en.txt
doc/manual/einsteiger.tex
include/config.nsi.in
packages/packages.current
src/Makefile.am
src/inst-sections.nsi

index a4a0f14..e247dd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-08-30  Marcus Brinkmann  <marcus@g10code.de>
 
+       * configure.ac: Add gpgex.
+       * include/config.nsi.in: Add gpgex.
+       * src/Makefile.am (EXTRA_DIST): Add inst-gpgex.nsi and
+       uninst-gpgex.nsi.
+       (gpg4win_spkgs): Add gpgex.
+       (gpg4win_pkg_gpgex_configure): New variable.
+       * src/inst-sections.nsi: Add gpgex installer and uninstaller, as
+       well as description.
+       (CalcDefaults, CalcDepends): Add gpgex.
+
+2007-08-30  Marcus Brinkmann  <marcus@g10code.de>
+
        * packages/download.sh: Implement new "name" command and remove
        "ren" command.
        * packages/packages.current: Add qt.
index 01b89cd..ccd2704 100644 (file)
@@ -199,6 +199,7 @@ GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
 GPG4WIN_SPKG([pthreads-w32])
 GPG4WIN_SPKG([pinentry])
 GPG4WIN_SPKG([gpgol], [gpgme])
+GPG4WIN_SPKG([gpgex])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
 GPG4WIN_SPKG([winpt], [gpgme gnupg])
 GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
index 1e9e718..c00b83f 100644 (file)
@@ -1,3 +1,8 @@
+2007-08-30  Marcus Brinkmann  <marcus@g10code.de>
+
+       * manual/einsteiger.tex (Automatische Installation von Gpg4win),
+       README.de.txt, README.en.txt: Add inst_gpgex key.
+
 2007-08-29  Jan-Oliver Wagner  <jan-oliver.wagner@intevation.de>
 
        * CD, CD/README.txt, CD/Makefile: New. Initial coarse creation
index c3e9b70..4f4e735 100644 (file)
@@ -87,6 +87,7 @@ zugleich alle erlaubten Schl
   ; verwendet wird.
   inst_gnupg2 = true
   inst_gpgol = true
+  inst_gpgex = true
   inst_gpa = true
   inst_winpt = true
   inst_gpgee = true
index 5b3f111..fb6a774 100644 (file)
@@ -67,6 +67,7 @@ all possible keys:
   ; Installer settings.  Do not define or leave empty for defaults.
   inst_gnupg2 = false
   inst_gpgol = true
+  inst_gpgex = true
   inst_gpa = true
   inst_winpt = true
   inst_gpgee = true
index 228a580..b32017b 100644 (file)
@@ -1651,6 +1651,7 @@ zugleich alle erlaubten Schl
   ; Installer Einstellungen. Weg- oder leerlassen für Voreinstellung
   inst_gnupg2 = true
   inst_gpgol = true
+  inst_gpgex = true
   inst_gpa = true
   inst_winpt = true
   inst_gpgee = true
index a5ac4ed..573a10b 100644 (file)
 !define gpg4win_pkg_gpgol @gpg4win_pkg_gpgol@
 !define gpg4win_pkg_gpgol_version @gpg4win_pkg_gpgol_version@
 
+@HAVE_PKG_GPGEX@
+!define gpg4win_pkg_gpgex @gpg4win_pkg_gpgex@
+!define gpg4win_pkg_gpgex_version @gpg4win_pkg_gpgex_version@
+
 @HAVE_PKG_GPA@
 !define gpg4win_pkg_gpa @gpg4win_pkg_gpa@
 !define gpg4win_pkg_gpa_version @gpg4win_pkg_gpa_version@
index b90d749..70b116b 100644 (file)
@@ -207,6 +207,12 @@ file gpgol-0.9.91.tar.bz2
 chk  391eee90ea072ea181bed332b9411f2a43395e7e
 
 #
+# GpgEX
+#
+
+# FIXME: Add this when released.
+
+#
 # Pth emulation
 #
 server ftp://ftp.g10code.com/g10code/w32pth
index 3600961..9c75ce0 100644 (file)
@@ -37,6 +37,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
         inst-gpgee.nsi            uninst-gpgee.nsi           \
         inst-gpgme.nsi            uninst-gpgme.nsi           \
         inst-gpgol.nsi            uninst-gpgol.nsi           \
+        inst-gpgex.nsi            uninst-gpgex.nsi           \
         inst-gtk+.nsi             uninst-gtk+.nsi            \
         inst-jpeg.nsi             uninst-jpeg.nsi            \
         inst-libassuan.nsi        uninst-libassuan.nsi       \
@@ -67,7 +68,8 @@ CLEANFILES = g4wihelp.dll versioninfo.txt README.en.txt README.de.txt \
              installer-options.ini NEWS.tmp gpgwrap.exe
 
 # Supported source packages.
-gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
+gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpgex \
+               gpa winpt sylpheed-claws \
                claws-mail gnupg2 pinentry libassuan libksba \
                libgcrypt dirmngr w32pth
 
@@ -159,6 +161,8 @@ gpg4win_pkg_gpa_configure = --silent \
 gpg4win_pkg_gpgol_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
+gpg4win_pkg_gpgex_configure = --silent
+
 gpg4win_pkg_winpt_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
index 60deaef..e2bfbaf 100644 (file)
@@ -86,6 +86,9 @@
 !ifdef HAVE_PKG_GPGOL
 !include "inst-gpgol.nsi"
 !endif
+!ifdef HAVE_PKG_GPGEX
+!include "inst-gpgex.nsi"
+!endif
 !ifdef HAVE_PKG_PANGO
 !include "inst-pango.nsi"
 !endif
 !ifdef HAVE_PKG_PANGO
 !include "uninst-pango.nsi"
 !endif
+!ifdef HAVE_PKG_GPGEX
+!include "uninst-gpgex.nsi"
+!endif
 !ifdef HAVE_PKG_GPGOL
 !include "uninst-gpgol.nsi"
 !endif
@@ -295,6 +301,17 @@ calc_defaults_gnupg2_done:
 calc_defaults_gpgol_done:
 !endif
 
+!ifdef HAVE_PKG_GPGEX
+  g4wihelp::config_fetch_bool "inst_gpgex"
+  StrCmp $R0 "1" 0 calc_defaults_gpgex_not_one
+   !insertmacro SelectSection ${SEC_gpgex}
+   Goto calc_defaults_gpgex_done
+  calc_defaults_gpgex_not_one:
+  StrCmp $R0 "0" 0 calc_defaults_gpgex_done
+   !insertmacro UnselectSection ${SEC_gpgex}
+calc_defaults_gpgex_done:
+!endif
+
 !ifdef HAVE_PKG_GPA
   g4wihelp::config_fetch_bool "inst_gpa"
   StrCmp $R0 "1" 0 calc_defaults_gpa_not_one
@@ -591,6 +608,14 @@ Function CalcDepends
   skip_gpgol:
 !endif
 
+!ifdef HAVE_PKG_GPGEX
+  !insertmacro SectionFlagIsSet ${SEC_gpgex} \
+               ${SF_SELECTED} have_gpgex skip_gpgex
+  have_gpgex:
+  # FIXME: Add Kleopatra as dependency.
+  skip_gpgex:
+!endif
+
 !ifdef HAVE_PKG_LIBPNG
   !insertmacro SectionFlagIsSet ${SEC_libpng} \
                ${SF_SELECTED} have_libpng skip_libpng
@@ -725,6 +750,9 @@ FunctionEnd
 !ifdef HAVE_PKG_GPGOL
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgol} $(DESC_SEC_gpgol)
 !endif
+!ifdef HAVE_PKG_GPGEX
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpgex} $(DESC_SEC_gpgex)
+!endif
 !ifdef HAVE_PKG_GPA
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_gpa} $(DESC_SEC_gpa)
 !endif