[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.0.3-5-g3d1a1b3
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Feb 27 12:17:06 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 3d1a1b30e2b8df7770bec5c514d3fe30d84d8b7b (commit)
from f2e277de5da0b91f83a8f8e71237ff10612331a3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3d1a1b30e2b8df7770bec5c514d3fe30d84d8b7b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 27 12:14:39 2018 +0100
Add gpg4win-tools package
* configure.ac, packages/packages.current,
src/Makefile.am, src/config.nsi.in, src/inst-sections.nsi:
Add gpg4win-tools package
--
Gpg4win tools is a playground for small Gpg4win tools.
GpgOL will depend on it in the future.
diff --git a/configure.ac b/configure.ac
index b7271c1..fe602cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,6 +366,7 @@ GPG4WIN_KDEPKG([karchive], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets karchive])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
GPG4WIN_KDEPKG([libkleo], [kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
+GPG4WIN_KDEPKG([gpg4win-tools], [libkleo gpgme])
GPG4WIN_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index 3edd738..69a7b33 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -544,6 +544,13 @@ chk 9c3da7c8b99c9f3eff5b0bd57fc5d100ebfcc3717516a5e2e7261481503943b8
file kde-l10n/kde-l10n-201712080943-src.tar.xz
chk 4e6993d5a28de4f4338d96de0edb5d7cb9243976d647162d0539b021a853bafb
+# Gpg4win-tools package (experimental)
+# last changed: see package date.
+# by: ah
+# verified: Tarball created by ah.
+file gpg4win-tools/gpg4win-tools-201802071407.tar.gz
+chk 4bfaad6ce235b0ee390d48df69764874317b7a6eb2433a8fec4120ce2ff9f6f5
+
# Kleopatra
# last changed: see package date.
# by: ah
diff --git a/src/Makefile.am b/src/Makefile.am
index f4458aa..aaa091e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,6 +84,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-qttranslations.nsi uninst-qttranslations.nsi \
inst-boost.nsi uninst-boost.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
+ inst-gpg4win-tools.nsi uninst-gpg4win-tools.nsi \
inst-final.nsi index.theme \
slideshow/slides.dat \
slideshow/slide1-gpgol.png \
@@ -121,7 +122,8 @@ gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg qttranslations
gpg4win_kdepkgs = kconfig kwidgetsaddons ki18n extra-cmake-modules \
kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
- kiconthemes kleopatra breeze-icons kitemmodels karchive
+ kiconthemes kleopatra breeze-icons kitemmodels karchive \
+ gpg4win-tools
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 98dc0d0..d1fff45 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -282,6 +282,10 @@
!define gpg4win_pkg_karchive @gpg4win_pkg_karchive@
!define gpg4win_pkg_karchive_version @gpg4win_pkg_karchive_version@
+ at HAVE_PKG_GPG4WIN_TOOLS@
+!define gpg4win_pkg_gpg4win_tools @gpg4win_pkg_gpg4win_tools@
+!define gpg4win_pkg_gpg4win_tools_version @gpg4win_pkg_gpg4win_tools_version@
+
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-gpg4win-tools.nsi b/src/inst-gpg4win-tools.nsi
new file mode 100644
index 0000000..5063a29
--- /dev/null
+++ b/src/inst-gpg4win-tools.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2018 Intevation 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gpg4win-tools-${gpg4win_pkg_gpg4win_tools_version}
+
+!ifdef DEBUG
+Section "gpg4win_tools" SEC_gpg4win-tools
+!else
+Section "-gpg4win_tools" SEC_gpg4win-tools
+!endif
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/resolver.exe
+!ifdef SOURCES
+ File "${gpg4win_pkg_gpg4win_tools}"
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 96c806f..429d6b5 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -167,6 +167,9 @@
!ifdef HAVE_PKG_QTTRANSLATIONS
!include "inst-qttranslations.nsi"
!endif
+!ifdef HAVE_PKG_GPG4WIN_TOOLS
+!include "inst-gpg4win-tools.nsi"
+!endif
# These are displayed in the selection dialog.
@@ -395,6 +398,9 @@
!ifdef HAVE_PKG_QTTRANSLATIONS
!include "uninst-qttranslations.nsi"
!endif
+!ifdef HAVE_PKG_GPG4WIN_TOOLS
+!include "uninst-gpg4win-tools.nsi"
+!endif
!include "uninst-gpg4win.nsi"
@@ -678,6 +684,9 @@ Function CalcDepends
!ifdef HAVE_PKG_QTTRANSLATIONS
!insertmacro UnselectSection ${SEC_qttranslations}
!endif
+!ifdef HAVE_PKG_GPG4WIN_TOOLS
+ !insertmacro UnselectSection ${SEC_gpg4win-tools}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -720,6 +729,7 @@ Function CalcDepends
${SF_SELECTED} have_gpgol skip_gpgol
have_gpgol:
!insertmacro SelectSection ${SEC_gpgme}
+ !insertmacro SelectSection ${SEC_gpg4win-tools}
# This is not a build dependency, but it is a run-time dependency.
!insertmacro SectionFlagIsSet ${SEC_gpa} \
diff --git a/src/uninst-gpg4win-tools.nsi b/src/uninst-gpg4win-tools.nsi
new file mode 100644
index 0000000..38503fa
--- /dev/null
+++ b/src/uninst-gpg4win-tools.nsi
@@ -0,0 +1,31 @@
+# Copyright (C) 2018 Intevation 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gpg4win_tools-${gpg4win_pkg_gpg4win_tools_version}
+
+; Uninstaller section.
+Section "-un.gpg4win_tools"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_gpg4win_tools}"
+ Call un.SourceDelete
+!endif
+ Delete /REBOOTOK "$INSTDIR\bin\resolver.exe"
+ RMDir "$INSTDIR\bin"
+SectionEnd
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
packages/packages.current | 7 +++++++
src/Makefile.am | 4 +++-
src/config.nsi.in | 4 ++++
src/{inst-karchive.nsi => inst-gpg4win-tools.nsi} | 16 +++++++---------
src/inst-sections.nsi | 10 ++++++++++
src/{uninst-kcodecs.nsi => uninst-gpg4win-tools.nsi} | 14 ++++++--------
7 files changed, 38 insertions(+), 18 deletions(-)
copy src/{inst-karchive.nsi => inst-gpg4win-tools.nsi} (75%)
copy src/{uninst-kcodecs.nsi => uninst-gpg4win-tools.nsi} (77%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list