[Gpg4win-commits] r539 - in trunk: . include packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Sep 25 18:39:46 CEST 2007
Author: marcus
Date: 2007-09-25 18:39:45 +0200 (Tue, 25 Sep 2007)
New Revision: 539
Added:
trunk/src/inst-kleopatra.nsi
trunk/src/uninst-kleopatra.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/packages/packages.current
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2007-09-25 Marcus Brinkmann <marcus at g10code.de>
* configure.ac: Add check for kleopatra.
* include/config.nsi.in: Add macros for kleopatra.
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: New files.
* src/Makefile.am (gpg4win_bpkgs): Add kleopatra.
(EXTRA_DIST): Add inst-kleopatra.nsi and uninst-kleopatra.nsi.
* src/inst-sections.nsi: Add support for kleopatra.
* packages/packages.current: Add kleopatra.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/ChangeLog 2007-09-25 16:39:45 UTC (rev 539)
@@ -1,5 +1,13 @@
2007-09-25 Marcus Brinkmann <marcus at g10code.de>
+ * configure.ac: Add check for kleopatra.
+ * include/config.nsi.in: Add macros for kleopatra.
+ * src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: New files.
+ * src/Makefile.am (gpg4win_bpkgs): Add kleopatra.
+ (EXTRA_DIST): Add inst-kleopatra.nsi and uninst-kleopatra.nsi.
+ * src/inst-sections.nsi: Add support for kleopatra.
+ * packages/packages.current: Add kleopatra.
+
* src/gpg4win.nsi: Disable kdelibs, kdesupport, oxygen-icons in
light installer.
* configure.ac: Add check for kdelibs.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/configure.ac 2007-09-25 16:39:45 UTC (rev 539)
@@ -218,6 +218,7 @@
GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg gnupg2 kdelibs])
GPG4WIN_FINALIZE
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/include/config.nsi.in 2007-09-25 16:39:45 UTC (rev 539)
@@ -227,6 +227,11 @@
!define gpg4win_pkg_kdelibs_dev @gpg4win_pkg_kdelibs_dev@
!define gpg4win_pkg_kdelibs_src @gpg4win_pkg_kdelibs_src@
+ at HAVE_PKG_KLEOPATRA@
+!define gpg4win_pkg_kleopatra @gpg4win_pkg_kleopatra@
+!define gpg4win_pkg_kleopatra_version @gpg4win_pkg_kleopatra_version@
+!define gpg4win_pkg_kleopatra_src @gpg4win_pkg_kleopatra_src@
+
# Internal packages.
@HAVE_PKG_MAN_NOVICE_DE@
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/packages/packages.current 2007-09-25 16:39:45 UTC (rev 539)
@@ -340,3 +340,13 @@
# all the sources.
file kdelibs-svn713936.tar.bz2
chk 7c2b10819ed4eb1c17e7b5076b9e494ad8bdddbb
+
+# Kleopatra
+
+server ftp://ftp.kdab.net/pub/gpg4win
+
+name kleopatra-20070920-2-bin.zip
+file kleo-uiserver-only-20070920-2-bin.zip
+# FIXME: This is totally wrong. We don't have a source package!
+link kleopatra-20070920-2-src.zip
+chk 18e31cbf54c54db47e4b9ede0ab317d9cb8643e8
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/src/Makefile.am 2007-09-25 16:39:45 UTC (rev 539)
@@ -63,6 +63,7 @@
inst-kdesupport.nsi uninst-kdesupport.nsi \
inst-oxygen-icons.nsi uninst-oxygen-icons.nsi \
inst-kdelibs.nsi uninst-kdelibs.nsi \
+ inst-kleopatra.nsi uninst-kleopatra.nsi \
inst-bzip2.nsi uninst-bzip2.nsi
# Need to clean the dll because we bypassed automake.
@@ -218,7 +219,8 @@
# Supported binary packages.
gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
- atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs
+ atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs \
+ kleopatra
# libiconv needs some special magic to generate a usable import
# library.
Added: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/src/inst-kleopatra.nsi 2007-09-25 16:39:45 UTC (rev 539)
@@ -0,0 +1,74 @@
+# inst-kleopatra.nsi - Installer snippet for kleopatra. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kleopatra-${gpg4win_pkg_kleopatra_version}
+
+Section "kleopatra" SEC_kleopatra
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kleopatra_src}"
+!else
+
+ File ${prefix}/bin/kleopatra.exe
+ File ${prefix}/bin/test_uiserver.exe
+ File ${prefix}/lib/libgpgme++-glib.dll
+ File ${prefix}/lib/libgpgme++-qt.dll
+ File ${prefix}/lib/libgpgme++.dll
+ File ${prefix}/lib/libkleo.dll
+ File ${prefix}/lib/libqgpgme.dll
+
+ SetOutPath "$INSTDIR\lib\kde4"
+
+ SetOutPath "$INSTDIR\share\applications\kde4"
+
+ File ${prefix}/share/applications/kde4/kleopatra_import.desktop
+
+ SetOutPath "$INSTDIR\share\apps\kleopatra"
+
+ File ${prefix}/share/apps/kleopatra/kleopatraui.rc
+
+ SetOutPath "$INSTDIR\share\apps\libkleopatra/pics"
+
+ File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png
+ File ${prefix}/share/apps/libkleopatra/pics/key.png
+ File ${prefix}/share/apps/libkleopatra/pics/key_bad.png
+ File ${prefix}/share/apps/libkleopatra/pics/key_ok.png
+ File ${prefix}/share/apps/libkleopatra/pics/key_unknown.png
+
+ SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
+
+ File ${prefix}/share/icons/oxygen/16x16/apps/gpg.png
+ File ${prefix}/share/icons/oxygen/16x16/apps/gpgsm.png
+
+ SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
+
+ File ${prefix}/share/icons/oxygen/22x22/apps/gpg.png
+ File ${prefix}/share/icons/oxygen/22x22/apps/gpgsm.png
+
+ SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"
+
+ File ${prefix}/share/icons/oxygen/32x32/apps/gpg.png
+ File ${prefix}/share/icons/oxygen/32x32/apps/gpgsm.png
+
+!endif
+SectionEnd
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/src/inst-sections.nsi 2007-09-25 16:39:45 UTC (rev 539)
@@ -131,6 +131,9 @@
!ifdef HAVE_PKG_KDELIBS
!include "inst-kdelibs.nsi"
!endif
+!ifdef HAVE_PKG_KLEOPATRA
+!include "inst-kleopatra.nsi"
+!endif
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "inst-man_novice_en.nsi"
!endif
@@ -158,6 +161,9 @@
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "uninst-man_novice_en.nsi"
!endif
+!ifdef HAVE_PKG_KLEOPATRA
+!include "uninst-kleopatra.nsi"
+!endif
!ifdef HAVE_PKG_KDELIBS
!include "uninst-kdelibs.nsi"
!endif
@@ -508,6 +514,17 @@
# Then enable all dependencies in reverse build list order!
+!ifdef HAVE_PKG_KLEOPATRA
+ !insertmacro SectionFlagIsSet ${SEC_kleopatra} ${SF_SELECTED} have_kleopatra skip_kleopatra
+ have_kleopatra:
+ !insertmacro SelectSection ${SEC_gpgme}
+ !insertmacro SelectSection ${SEC_gnupg}
+ !insertmacro SelectSection ${SEC_gnupg2}
+ # This drags in all the other KDE and Qt stuff.
+ !insertmacro SelectSection ${SEC_kdelibs}
+ skip_kleopatra:
+!endif
+
!ifdef HAVE_PKG_GNUPG2
!insertmacro SectionFlagIsSet ${SEC_gnupg2} ${SF_SELECTED} have_gnupg2 skip_gnupg2
have_gnupg2:
@@ -632,6 +649,7 @@
have_gpgol:
!insertmacro SelectSection ${SEC_gpgme}
!insertmacro SelectSection ${SEC_gnupg}
+ # FIXME: Add kleopatra dependency.
skip_gpgol:
!endif
@@ -639,7 +657,7 @@
!insertmacro SectionFlagIsSet ${SEC_gpgex} \
${SF_SELECTED} have_gpgex skip_gpgex
have_gpgex:
- # FIXME: Add Kleopatra as dependency.
+ !insertmacro SelectSection ${SEC_kleopatra}
skip_gpgex:
!endif
@@ -682,6 +700,8 @@
!insertmacro SectionFlagIsSet ${SEC_gpgme} \
${SF_SELECTED} have_gpgme skip_gpgme
have_gpgme:
+ # GPGME does not depend on gnupg or gnupg2. Do this in the
+ # actual application instead.
!insertmacro SelectSection ${SEC_libgpg_error}
!ifdef HAVE_PKG_QT
!insertmacro SelectSection ${SEC_qt}
Added: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2007-09-25 14:43:16 UTC (rev 538)
+++ trunk/src/uninst-kleopatra.nsi 2007-09-25 16:39:45 UTC (rev 539)
@@ -0,0 +1,81 @@
+# uninst-kleopatra.nsi - Installer snippet for kleopatra. -*- coding: latin-1; -*-
+# Copyright (C) 2005, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/kleopatra-${gpg4win_pkg_kleopatra_version}
+
+
+; Uninstaller section.
+Section "-un.kleopatra"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kleopatra_src}"
+ Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\kleopatra.exe"
+ Delete "$INSTDIR\test_uiserver.exe"
+ Delete "$INSTDIR\libgpgme++-glib.dll"
+ Delete "$INSTDIR\libgpgme++-qt.dll"
+ Delete "$INSTDIR\libgpgme++.dll"
+ Delete "$INSTDIR\libkleo.dll"
+ Delete "$INSTDIR\libqgpgme.dll"
+
+ Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
+
+ RMDir "$INSTDIR\share\applications\kde4"
+ RMDir "$INSTDIR\share\applications"
+
+ Delete "$INSTDIR\share\apps\kleopatra\kleopatraui.rc"
+ Delete "$INSTDIR\share\apps\libkleopatra\pics\chiasmus_chi.png"
+ Delete "$INSTDIR\share\apps\libkleopatra\pics\key.png"
+ Delete "$INSTDIR\share\apps\libkleopatra\pics\key_bad.png"
+ Delete "$INSTDIR\share\apps\libkleopatra\pics\key_ok.png"
+ Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
+
+ RMDir "$INSTDIR\share\apps\libkleopatra\pics"
+ RMDir "$INSTDIR\share\apps\libkleopatra"
+ RMDir "$INSTDIR\share\apps"
+
+ Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gpg.png"
+ Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gpgsm.png"
+
+ RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\16x16"
+
+ Delete "$INSTDIR\share\icons\oxygen\22x22\apps\gpg.png"
+ Delete "$INSTDIR\share\icons\oxygen\22x22\apps\gpgsm.png"
+
+ RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\22x22"
+
+ Delete "$INSTDIR\share\icons\oxygen\32x32\apps\gpg.png"
+ Delete "$INSTDIR\share\icons\oxygen\32x32\apps\gpgsm.png"
+
+ RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
+ RMDir "$INSTDIR\share\icons\oxygen\32x32"
+ RMDir "$INSTDIR\share\icons\oxygen"
+ RMDir "$INSTDIR\share\icons"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list