[Gpg4win-commits] r512 - in trunk: . doc doc/manual include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Aug 30 15:41:21 CEST 2007
Author: marcus
Date: 2007-08-30 15:41:20 +0200 (Thu, 30 Aug 2007)
New Revision: 512
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/doc/ChangeLog
trunk/doc/README.de.txt
trunk/doc/README.en.txt
trunk/doc/manual/einsteiger.tex
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2007-08-30 Marcus Brinkmann <marcus at 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.
doc/
2007-08-30 Marcus Brinkmann <marcus at g10code.de>
* manual/einsteiger.tex (Automatische Installation von Gpg4win),
README.de.txt, README.en.txt: Add inst_gpgex key.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/ChangeLog 2007-08-30 13:41:20 UTC (rev 512)
@@ -1,5 +1,17 @@
2007-08-30 Marcus Brinkmann <marcus at 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 at g10code.de>
+
* packages/download.sh: Implement new "name" command and remove
"ren" command.
* packages/packages.current: Add qt.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/configure.ac 2007-08-30 13:41:20 UTC (rev 512)
@@ -199,6 +199,7 @@
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
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/doc/ChangeLog 2007-08-30 13:41:20 UTC (rev 512)
@@ -1,3 +1,8 @@
+2007-08-30 Marcus Brinkmann <marcus at 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 at intevation.de>
* CD, CD/README.txt, CD/Makefile: New. Initial coarse creation
Modified: trunk/doc/README.de.txt
===================================================================
--- trunk/doc/README.de.txt 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/doc/README.de.txt 2007-08-30 13:41:20 UTC (rev 512)
@@ -87,6 +87,7 @@
; verwendet wird.
inst_gnupg2 = true
inst_gpgol = true
+ inst_gpgex = true
inst_gpa = true
inst_winpt = true
inst_gpgee = true
Modified: trunk/doc/README.en.txt
===================================================================
--- trunk/doc/README.en.txt 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/doc/README.en.txt 2007-08-30 13:41:20 UTC (rev 512)
@@ -67,6 +67,7 @@
; 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
Modified: trunk/doc/manual/einsteiger.tex
===================================================================
--- trunk/doc/manual/einsteiger.tex 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/doc/manual/einsteiger.tex 2007-08-30 13:41:20 UTC (rev 512)
@@ -1651,6 +1651,7 @@
; 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
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/include/config.nsi.in 2007-08-30 13:41:20 UTC (rev 512)
@@ -94,6 +94,10 @@
!define gpg4win_pkg_gpgol @gpg4win_pkg_gpgol@
!define gpg4win_pkg_gpgol_version @gpg4win_pkg_gpgol_version@
+ at 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@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/packages/packages.current 2007-08-30 13:41:20 UTC (rev 512)
@@ -207,6 +207,12 @@
chk 391eee90ea072ea181bed332b9411f2a43395e7e
#
+# GpgEX
+#
+
+# FIXME: Add this when released.
+
+#
# Pth emulation
#
server ftp://ftp.g10code.com/g10code/w32pth
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/src/Makefile.am 2007-08-30 13:41:20 UTC (rev 512)
@@ -37,6 +37,7 @@
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 @@
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_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)
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-08-30 13:19:47 UTC (rev 511)
+++ trunk/src/inst-sections.nsi 2007-08-30 13:41:20 UTC (rev 512)
@@ -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
@@ -179,6 +182,9 @@
!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_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 @@
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 @@
!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
More information about the Gpg4win-commits
mailing list