[Gpg4win-commits] r412 - in trunk: . include src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jun 15 14:35:47 CEST 2007
Author: werner
Date: 2007-06-15 14:35:46 +0200 (Fri, 15 Jun 2007)
New Revision: 412
Added:
trunk/src/inst-gnupg2.nsi
trunk/src/inst-libassuan.nsi
trunk/src/inst-libgcrypt.nsi
trunk/src/inst-libksba.nsi
trunk/src/inst-w32pth.nsi
trunk/src/uninst-gnupg2.nsi
trunk/src/uninst-libassuan.nsi
trunk/src/uninst-libgcrypt.nsi
trunk/src/uninst-libksba.nsi
trunk/src/uninst-w32pth.nsi
Modified:
trunk/ChangeLog
trunk/README
trunk/configure.ac
trunk/include/config.nsi.in
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
trunk/src/uninst-gnupg.nsi
Log:
A bunch of changes to support gnupg2 - not yet ready but it should not
harm either.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/ChangeLog 2007-06-15 12:35:46 UTC (rev 412)
@@ -1,3 +1,16 @@
+2007-06-15 Werner Koch <wk at g10code.com>
+
+ * src/Makefile.am: Use --silent with most configure runs.
+
+ * src/uninst-gnupg2.nsi, src/inst-libgnupg2.nsi: New.
+ * src/uninst-libassun.nsi, src/inst-libassuan.nsi: New.
+ * src/inst-libksba.nsi, src/uninst-libksba.nsi: New.
+ * src/inst-libgcrypt.nsi, src/uninst-libgcrypt.nsi: New.
+ * src/inst-sections.nsi: Include new installation scripts.a
+ * include/config.nsi.in: Add definitions for new packages.
+
+ * src/uninst-gnupg.nsi: Fix removal of gpgkeys helper.
+
2007-06-12 Marcus Brinkmann <marcus at g10code.de>
* src/gpgwrap.c (main): Call _spawnv, not execv.
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/README 2007-06-15 12:35:46 UTC (rev 412)
@@ -12,6 +12,14 @@
[...]
$ cd ..
+ If you have downloaded gnupg-2.x, you need to repack it so that the
+ name of the apckage is gnupg2. For example:
+
+ tar xjf gnupg-2.0.5.tar.bz2
+ mv gnupg-2.0.5 gnupg2-2.0.5
+ tar chf gnupg2-2.0.5.tar.bz2 gnupg2-2.0.5
+
+
2. Configure the source tree for cross compilation:
$ configure --host=i586-mingw32msvc
@@ -42,6 +50,7 @@
texinfo
imagemagick
tetex-bin
+ tetex-extra
gs-common
hyperlatex
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/configure.ac 2007-06-15 12:35:46 UTC (rev 412)
@@ -179,8 +179,15 @@
GPG4WIN_BPKG_BINSRC([GPGee], [gnupg])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
+GPG4WIN_SPKG([libgcrypt], [libgpg-error])
+GPG4WIN_SPKG([libksba], [libgpg-error])
+GPG4WIN_SPKG([libassuan], [w32pth])
+GPG4WIN_SPKG([w32pth])
+GPG4WIN_SPKG([pinentry], [libiconv])
GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib])
GPG4WIN_SPKG([gnupg], [libiconv])
+GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
+ w32pth zlib])
GPG4WIN_SPKG([pthreads-w32])
GPG4WIN_SPKG([gpgol], [gpgme])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/include/config.nsi.in 2007-06-15 12:35:46 UTC (rev 412)
@@ -54,6 +54,22 @@
!define gpg4win_pkg_libgpg_error @gpg4win_pkg_libgpg_error@
!define gpg4win_pkg_libgpg_error_version @gpg4win_pkg_libgpg_error_version@
+ at HAVE_PKG_W32PTH@
+!define gpg4win_pkg_w32pth @gpg4win_pkg_w32pth@
+!define gpg4win_pkg_w32pth_version @gpg4win_pkg_w32pth_version@
+
+ at HAVE_PKG_LIBASSUAN@
+!define gpg4win_pkg_libassuan @gpg4win_pkg_libassuan@
+!define gpg4win_pkg_libassuan_version @gpg4win_pkg_libassuan_version@
+
+ at HAVE_PKG_LIBGCRYPT@
+!define gpg4win_pkg_libgcrypt @gpg4win_pkg_libgcrypt@
+!define gpg4win_pkg_libgcrypt_version @gpg4win_pkg_libgcrypt_version@
+
+ at HAVE_PKG_LIBKSBA@
+!define gpg4win_pkg_libksba @gpg4win_pkg_libksba@
+!define gpg4win_pkg_libksba_version @gpg4win_pkg_libksba_version@
+
@HAVE_PKG_GPGME@
!define gpg4win_pkg_gpgme @gpg4win_pkg_gpgme@
!define gpg4win_pkg_gpgme_version @gpg4win_pkg_gpgme_version@
@@ -62,6 +78,10 @@
!define gpg4win_pkg_gnupg @gpg4win_pkg_gnupg@
!define gpg4win_pkg_gnupg_version @gpg4win_pkg_gnupg_version@
+ at HAVE_PKG_GNUPG2@
+!define gpg4win_pkg_gnupg2 @gpg4win_pkg_gnupg2@
+!define gpg4win_pkg_gnupg2_version @gpg4win_pkg_gnupg2_version@
+
@HAVE_PKG_GPGOL@
!define gpg4win_pkg_gpgol @gpg4win_pkg_gpgol@
!define gpg4win_pkg_gpgol_version @gpg4win_pkg_gpgol_version@
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/Makefile.am 2007-06-15 12:35:46 UTC (rev 412)
@@ -30,7 +30,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 gpa winpt sylpheed-claws \
+ gnupg2 libassuan libksba libgcrypt w32pth
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -62,25 +63,45 @@
# non-"libfoo.la" versions of iconv and gettext that we are using.
#gpg4win_pkg_libgpg_error_configure = \
# --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir)
-gpg4win_pkg_libgpg_error_configure = \
+gpg4win_pkg_libgpg_error_configure = --silent \
CPPFLAGS=-I$(idir)/include LDFLAGS=-L$(idir)/lib
+gpg4win_pkg_libassuan_configure = --silent \
+ --disable-shared \
+ --with-pth-prefix=$(idir)
+
+gpg4win_pkg_libksba_configure = --silent \
+ --with-gpg-error-prefix=$(idir)
+
+gpg4win_pkg_libgcrypt_configure = --silent \
+ --with-gpg-error-prefix=$(idir)
+
+gpg4win_pkg_gnupg2_configure = \
+ --with-gpg-error-prefix=$(idir) \
+ --with-ksba-prefix=$(idir) \
+ --with-libgcrypt-prefix=$(idir) \
+ --with-libassuan-prefix=$(idir) \
+ --with-zlib=$(idir) \
+ --with-pth-prefix=$(idir) \
+ --without-included-gettext
+
+
# Glib doesn't add the LDFLAGS automatically.
-gpg4win_pkg_gpgme_configure = \
+gpg4win_pkg_gpgme_configure = --silent \
--with-gpg-error-prefix=$(idir) --without-gpgsm --enable-static \
--enable-w32-glib LDFLAGS=-L$(idir)/lib
-gpg4win_pkg_gpa_configure = \
+gpg4win_pkg_gpa_configure = --silent \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
--with-gpgme-prefix=$(idir) --with-zlib=$(idir)
-gpg4win_pkg_gpgol_configure = \
+gpg4win_pkg_gpgol_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
-gpg4win_pkg_winpt_configure = \
+gpg4win_pkg_winpt_configure = --silent \
--with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
-gpg4win_pkg_sylpheed_claws_configure = \
+gpg4win_pkg_sylpheed_claws_configure = --silent \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
--with-gpg-error-prefix=$(idir) --with-gpgme-prefix=$(idir) \
--with-config-dir="Sylpheed-claws" --disable-pthread \
Added: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/inst-gnupg2.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,68 @@
+# inst-gnupgw.nsi - Installer snippet for gnupg2. -*- 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}/gnupg-${gpg4win_pkg_gnupg2_version}
+
+
+Section "GnuPG2" SEC_gnupg2
+
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_gnupg2}"
+!else
+ File "${prefix}/bin/gpg2.exe"
+ File "${prefix}/bin/gpgsm.exe"
+ File "${prefix}/bin/gpg-agent.exe"
+ File "${prefix}/bin/scdaemon.exe"
+
+ # As a special exception, these programs are not kept in
+ # libexec/gnupg, where they belong. Please see the comment in
+ # gnupg/g10/keyserver.c::keyserver_spawn() for an explanation.
+ File "${prefix}/libexec/gnupg/gpg2keys_finger.exe"
+ File "${prefix}/libexec/gnupg/gpg2keys_hkp.exe"
+ File "${prefix}/libexec/gnupg/gpg2keys_curl.exe"
+ File "${prefix}/libexec/gnupg/gpg2keys_ldap.exe"
+
+ SetOutPath "$INSTDIR\pub"
+ File /oname=gpg2.exe "${BUILD_DIR}/gpgwrap.exe"
+ File /oname=gpgsm.exe "${BUILD_DIR}/gpgwrap.exe"
+
+# Fixme:
+# SetOutPath "$INSTDIR\share\gnupg"
+# File "${prefix}/share/gnupg/options.skel"
+# File "${prefix}/share/gnupg/FAQ"
+# File "${prefix}/share/gnupg/faq.html"
+# File "${prefix}/share/man/man1/gpg.man"
+# File "${prefix}/share/man/man1/gpgv.man"
+# File "${prefix}/share/man/man7/gnupg.man"
+
+ # Install the language files for gpg. Note that the PO files are
+ # required to be UTF-8 encoded and that the post-install macro in
+ # Makefile.am needs to build them.
+# SetOutPath "$INSTDIR\gnupg2.nls"
+# File "${prefix}/share/gnupg2/de.mo"
+
+!endif
+SectionEnd
+
Added: trunk/src/inst-libassuan.nsi
===================================================================
--- trunk/src/inst-libassuan.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/inst-libassuan.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,40 @@
+# inst-libassuan.nsi - snippet for libassuan. -*- 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}/libassuan-${gpg4win_pkg_libassuan_version}
+
+
+!ifdef DEBUG
+Section "libassuan" SEC_libassuan
+!else
+Section "-libassuan" SEC_libassuan
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_libassuan}"
+!else
+ # Nothing to install as we link statically.
+
+!endif
+SectionEnd
Added: trunk/src/inst-libgcrypt.nsi
===================================================================
--- trunk/src/inst-libgcrypt.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/inst-libgcrypt.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,40 @@
+# inst-libgcrypt.nsi - snippet for libgcrypt. -*- 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}/libgcrypt-${gpg4win_pkg_libgcrypt_version}
+
+
+!ifdef DEBUG
+Section "libgcrypt" SEC_libgcrypt
+!else
+Section "-libgcrypt" SEC_libgcrypt
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_libgcrypt}"
+!else
+ File ${prefix}/bin/libgcrypt-11.dll
+
+!endif
+SectionEnd
Added: trunk/src/inst-libksba.nsi
===================================================================
--- trunk/src/inst-libksba.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/inst-libksba.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,40 @@
+# inst-libksba.nsi - snippet for libksba. -*- 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}/libksba-${gpg4win_pkg_libksba_version}
+
+
+!ifdef DEBUG
+Section "libksba" SEC_libksba
+!else
+Section "-libksba" SEC_libksba
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_libksba}"
+!else
+ File ${prefix}/bin/libksba-8.dll
+
+!endif
+SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/inst-sections.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -26,9 +26,24 @@
!ifdef HAVE_PKG_GNUPG
!include "inst-gnupg.nsi"
!endif
+!ifdef HAVE_PKG_GNUPG2
+!include "inst-gnupg2.nsi"
+!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
!include "inst-libgpg-error.nsi"
!endif
+!ifdef HAVE_PKG_W32PTH
+!include "inst-w32pth.nsi"
+!endif
+!ifdef HAVE_PKG_LIBASSUAN
+!include "inst-libassuan.nsi"
+!endif
+!ifdef HAVE_PKG_LIBKSBA
+!include "inst-libksba.nsi"
+!endif
+!ifdef HAVE_PKG_LIBGCRYPT
+!include "inst-libgrypt.nsi"
+!endif
!ifdef HAVE_PKG_LIBICONV
!include "inst-libiconv.nsi"
!endif
@@ -182,11 +197,26 @@
!ifdef HAVE_PKG_LIBICONV
!include "uninst-libiconv.nsi"
!endif
+!ifdef HAVE_PKG_LIBGCRYPT
+!include "uninst-libgcrypt.nsi"
+!endif
+!ifdef HAVE_PKG_LIBKSBA
+!include "uninst-libksba.nsi"
+!endif
+!ifdef HAVE_PKG_LIBASSUAN
+!include "uninst-libassuan.nsi"
+!endif
+!ifdef HAVE_PKG_W32PTH
+!include "uninst-w32pth.nsi"
+!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
# Note that the uninstaller of libgpg-error is supposed to remove the shareed
# directories. We might want to move this to an extra section.
!include "uninst-libgpg-error.nsi"
!endif
+!ifdef HAVE_PKG_GNUPG2
+!include "uninst-gnupg2.nsi"
+!endif
!ifdef HAVE_PKG_GNUPG
!include "uninst-gnupg.nsi"
!endif
Added: trunk/src/inst-w32pth.nsi
===================================================================
--- trunk/src/inst-w32pth.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/inst-w32pth.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,40 @@
+# inst-w32pth.nsi - snippet for w32pth. -*- 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}/w32pth-${gpg4win_pkg_w32pth_version}
+
+
+!ifdef DEBUG
+Section "w32pth" SEC_w32pth
+!else
+Section "-w32pth" SEC_w32pth
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_w32pth}"
+!else
+ # Nothing to install as we link statically.
+
+!endif
+SectionEnd
Modified: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/uninst-gnupg.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -33,17 +33,18 @@
Delete "$INSTDIR\gpg.exe"
Delete "$INSTDIR\gpgsplit.exe"
Delete "$INSTDIR\gpgv.exe"
+
Delete "$INSTDIR\pub\gpg.exe"
Delete "$INSTDIR\pub\gpgsplit.exe"
Delete "$INSTDIR\pub\gpgv.exe"
+ RMDir "$INSTDIR\pub"
- Delete "$INSTDIR\pub\gpgkeys_finger.exe"
- Delete "$INSTDIR\pub\gpgkeys_hkp.exe"
- Delete "$INSTDIR\pub\gpgkeys_curl.exe"
- Delete "$INSTDIR\pub\gpgkeys_ldap.exe"
+ Delete "$INSTDIR\gpgkeys_finger.exe"
+ Delete "$INSTDIR\gpgkeys_hkp.exe"
+ Delete "$INSTDIR\gpgkeys_curl.exe"
+ Delete "$INSTDIR\gpgkeys_ldap.exe"
# Old gpg versions come with a separate http keyserver helper.
- Delete "$INSTDIR\pub\gpgkeys_http.exe"
- RMDir "$INSTDIR\pub"
+ Delete "$INSTDIR\gpgkeys_http.exe"
Delete "$INSTDIR\share\gnupg\options.skel"
Delete "$INSTDIR\share\gnupg\FAQ"
Added: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/uninst-gnupg2.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,62 @@
+# uninst-gnupg2.nsi - Uninstaller snippet for gnupg2. -*- 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}/gnupg-${gpg4win_pkg_gnupg2_version}
+
+
+# Uninstaller section.
+Section "-un.gnupg2"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_gnupg2}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\gpg2.exe"
+ Delete "$INSTDIR\gpgsm.exe"
+ Delete "$INSTDIR\gpg-agent.exe"
+ Delete "$INSTDIR\scdaemon.exe"
+
+ Delete "$INSTDIR\pub\gpg2.exe"
+ Delete "$INSTDIR\pub\gpgsm.exe"
+ RMDir "$INSTDIR\pub"
+
+ Delete "$INSTDIR\gpg2keys_finger.exe"
+ Delete "$INSTDIR\gpg2keys_hkp.exe"
+ Delete "$INSTDIR\gpg2keys_curl.exe"
+ Delete "$INSTDIR\gpg2keys_ldap.exe"
+
+# Delete "$INSTDIR\share\gnupg\options.skel"
+# Delete "$INSTDIR\share\gnupg\FAQ"
+# Delete "$INSTDIR\share\gnupg\faq.html"
+# Delete "$INSTDIR\share\gnupg\gpg.man"
+# Delete "$INSTDIR\share\gnupg\gpgv.man"
+# Delete "$INSTDIR\share\gnupg\gnupg.man"
+# RMDir "$INSTDIR\share\gnupg"
+# RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+# Delete "$INSTDIR\gnupg.nls\de.mo"
+# RMDir "$INSTDIR\gnupg.nls"
+
+!endif
+SectionEnd
Added: trunk/src/uninst-libassuan.nsi
===================================================================
--- trunk/src/uninst-libassuan.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/uninst-libassuan.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,38 @@
+# uninst-libassuan.nsi - Uninstaller f. libassuan. -*- 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}/libassuan-${gpg4win_pkg_libassuan_version}
+
+
+; Uninstaller section.
+Section "-un.libassuan"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_libassuan}"
+ Call un.SourceDelete
+!else
+ # Nothing to uninstall as we link static.
+
+!endif
+SectionEnd
+
Added: trunk/src/uninst-libgcrypt.nsi
===================================================================
--- trunk/src/uninst-libgcrypt.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/uninst-libgcrypt.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,38 @@
+# uninst-libgcrypt.nsi - Uninstaller f. libgcrypt. -*- 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}/libgcrypt-${gpg4win_pkg_libgcrypt_version}
+
+
+; Uninstaller section.
+Section "-un.libgcrypt"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_libgcrypt}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\libgcrypt-11.dll"
+
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
Added: trunk/src/uninst-libksba.nsi
===================================================================
--- trunk/src/uninst-libksba.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/uninst-libksba.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,39 @@
+# uninst-libksba.nsi - Uninstaller f. libksba. -*- 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}/libksba-${gpg4win_pkg_libksba_version}
+
+
+; Uninstaller section.
+Section "-un.libksba"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_libksba}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\libksba-8.dll"
+
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
+
Added: trunk/src/uninst-w32pth.nsi
===================================================================
--- trunk/src/uninst-w32pth.nsi 2007-06-11 22:08:51 UTC (rev 411)
+++ trunk/src/uninst-w32pth.nsi 2007-06-15 12:35:46 UTC (rev 412)
@@ -0,0 +1,38 @@
+# uninst-w32pth.nsi - Uninstaller f. w32pth. -*- 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}/w32pth-${gpg4win_pkg_w32pth_version}
+
+
+; Uninstaller section.
+Section "-un.w32pth"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_w32pth}"
+ Call un.SourceDelete
+!else
+ # Nothing to uninstall as we link static.
+
+!endif
+SectionEnd
+
More information about the Gpg4win-commits
mailing list