[Gpg4win-commits] r422 - in trunk: . include src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jun 20 20:40:20 CEST 2007
Author: werner
Date: 2007-06-20 20:40:19 +0200 (Wed, 20 Jun 2007)
New Revision: 422
Added:
trunk/src/inst-pinentry.nsi
trunk/src/uninst-pinentry.nsi
Modified:
trunk/ChangeLog
trunk/README
trunk/configure.ac
trunk/include/config.nsi.in
trunk/src/Makefile.am
trunk/src/inst-gnupg2.nsi
trunk/src/inst-sections.nsi
trunk/src/uninst-gnupg2.nsi
Log:
Added pinentry
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/ChangeLog 2007-06-20 18:40:19 UTC (rev 422)
@@ -1,3 +1,14 @@
+2007-06-20 Werner Koch <wk at g10code.com>
+
+ * src/inst-sections.nsi, src/Makefile.am, src/uninst-pinentry.nsi
+ * src/inst-pinentry.nsi, include/config.nsi.in: Add new package
+ pinentry.
+ * src/Makefile.am (gpg4win_pkg_pinentry_configure): New.
+
+ * src/Makefile.am (gpg4win-$(VERSION).exe): Add versioninfo.txt as
+ dependency.
+ (gpg4win-light-$(VERSION).exe): Ditto.
+
2007-06-20 Marcus Brinkmann <marcus at g10code.de>
* po: New directory.
Modified: trunk/README
===================================================================
--- trunk/README 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/README 2007-06-20 18:40:19 UTC (rev 422)
@@ -47,6 +47,7 @@
texinfo
imagemagick
tetex-bin
+ tetex-extra
tr
gs-common
hyperlatex
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/configure.ac 2007-06-20 18:40:19 UTC (rev 422)
@@ -193,6 +193,7 @@
GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
w32pth zlib])
GPG4WIN_SPKG([pthreads-w32])
+GPG4WIN_SPKG([pinentry])
GPG4WIN_SPKG([gpgol], [gpgme])
GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
GPG4WIN_SPKG([winpt], [gpgme gnupg])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/include/config.nsi.in 2007-06-20 18:40:19 UTC (rev 422)
@@ -82,6 +82,10 @@
!define gpg4win_pkg_gnupg2 @gpg4win_pkg_gnupg2@
!define gpg4win_pkg_gnupg2_version @gpg4win_pkg_gnupg2_version@
+ at HAVE_PKG_PINENTRY@
+!define gpg4win_pkg_pinentry @gpg4win_pkg_pinentry@
+!define gpg4win_pkg_pinentry_version @gpg4win_pkg_pinentry_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-20 02:34:58 UTC (rev 421)
+++ trunk/src/Makefile.am 2007-06-20 18:40:19 UTC (rev 422)
@@ -31,7 +31,7 @@
# Supported source packages.
gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
- gnupg2 libassuan libksba libgcrypt w32pth
+ gnupg2 pinentry libassuan libksba libgcrypt w32pth
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -94,7 +94,12 @@
--without-included-gettext \
--disable-regex
+gpg4win_pkg_pinentry_configure = \
+ --disable-pinentry-gtk \
+ --disable-pinentry-gtk2 \
+ --disable-pinentry-qt
+
# Glib doesn't add the LDFLAGS automatically.
gpg4win_pkg_gpgme_configure = --silent \
--with-gpg-error-prefix=$(idir) --without-gpgsm --enable-static \
@@ -284,13 +289,13 @@
# So we have to pull a couple of strings to correct this.
gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
g4wihelp.dll gpgwrap.exe README.en.txt README.de.txt \
- installer-options.ini
+ installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) $(srcdir)/gpg4win.nsi
gpg4win-light-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final \
g4wihelp.dll gpgwrap.exe README.en.txt README.de.txt \
- installer-options.ini
+ installer-options.ini versioninfo.txt
$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
-DSRCDIR=$(srcdir) -DGPG4WIN_LIGHT=1 $(srcdir)/gpg4win.nsi
Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/src/inst-gnupg2.nsi 2007-06-20 18:40:19 UTC (rev 422)
@@ -1,4 +1,4 @@
-# inst-gnupgw.nsi - Installer snippet for gnupg2. -*- coding: latin-1; -*-
+# inst-gnupg2.nsi - Installer snippet for gnupg2. -*- coding: latin-1; -*-
# Copyright (C) 2007 g10 Code GmbH
#
# This file is part of Gpg4win.
Added: trunk/src/inst-pinentry.nsi
===================================================================
--- trunk/src/inst-pinentry.nsi 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/src/inst-pinentry.nsi 2007-06-20 18:40:19 UTC (rev 422)
@@ -0,0 +1,40 @@
+# inst-pinentry.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}/pinentry-${gpg4win_pkg_pinentry_version}
+
+!ifdef DEBUG
+Section "Pinentry" SEC_pinentry
+!else
+Section "-Pinentry" SEC_pinentry
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_pinentry}"
+!else
+ File /oname=pinentry.exe "${prefix}/bin/pinentry-w32.exe"
+
+!endif
+SectionEnd
+
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/src/inst-sections.nsi 2007-06-20 18:40:19 UTC (rev 422)
@@ -29,6 +29,9 @@
!ifdef HAVE_PKG_GNUPG2
!include "inst-gnupg2.nsi"
!endif
+!ifdef HAVE_PKG_PINENTRY
+!include "inst-pinentry.nsi"
+!endif
!ifdef HAVE_PKG_LIBGPG_ERROR
!include "inst-libgpg-error.nsi"
!endif
@@ -214,6 +217,9 @@
# directories. We might want to move this to an extra section.
!include "uninst-libgpg-error.nsi"
!endif
+!ifdef HAVE_PKG_PINENTRY
+!include "uninst-pinentry.nsi"
+!endif
!ifdef HAVE_PKG_GNUPG2
!include "uninst-gnupg2.nsi"
!endif
@@ -294,6 +300,9 @@
!ifdef HAVE_PKG_LIBGCRYPT
!insertmacro UnselectSection ${SEC_libgcrypt}
!endif
+!ifdef HAVE_PKG_PINENTRY
+ !insertmacro UnselectSection ${SEC_pinentry}
+!endif
# Then enable all dependencies in reverse build list order!
@@ -307,6 +316,7 @@
!insertmacro SelectSection ${SEC_libgpg_error}
!insertmacro SelectSection ${SEC_w32pth}
!insertmacro SelectSection ${SEC_zlib}
+ !insertmacro SelectSection ${SEC_pinentry}
skip_gnupg2:
!endif
@@ -354,17 +364,6 @@
skip_sylpheed:
!endif
-#!ifdef HAVE_PKG_EUDORAGPG
-# !insertmacro SectionFlagIsSet ${SEC_eudoragpg} ${SF_SELECTED} have_eudoragpg skip_eudoragpg
-# have_eudoragpg:
-# !insertmacro SelectSection ${SEC_zlib}
-# !insertmacro SelectSection ${SEC_gtk_}
-# !insertmacro SelectSection ${SEC_libpng}
-# !insertmacro SelectSection ${SEC_glib}
-# !insertmacro SelectSection ${SEC_gpgme}
-# !insertmacro SelectSection ${SEC_gnupg}
-# skip_eudoragpg:
-#!endif
!ifdef HAVE_PKG_GTK_
!insertmacro SectionFlagIsSet ${SEC_gtk_} \
Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/src/uninst-gnupg2.nsi 2007-06-20 18:40:19 UTC (rev 422)
@@ -22,7 +22,7 @@
!ifdef prefix
!undef prefix
!endif
-!define prefix ${ipdir}/gnupg-${gpg4win_pkg_gnupg2_version}
+!define prefix ${ipdir}/gnupg2-${gpg4win_pkg_gnupg2_version}
# Uninstaller section.
Added: trunk/src/uninst-pinentry.nsi
===================================================================
--- trunk/src/uninst-pinentry.nsi 2007-06-20 02:34:58 UTC (rev 421)
+++ trunk/src/uninst-pinentry.nsi 2007-06-20 18:40:19 UTC (rev 422)
@@ -0,0 +1,37 @@
+# uninst-pinentry.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}/pinentry-${gpg4win_pkg_pinentry_version}
+
+
+# Uninstaller section.
+Section "-un.pinentry"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_pinentry}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\pinentry.exe"
+
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list