[Gpg4win-commits] r427 - in trunk: . include src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jul 2 19:33:19 CEST 2007
Author: marcus
Date: 2007-07-02 19:33:19 +0200 (Mon, 02 Jul 2007)
New Revision: 427
Added:
trunk/src/inst-claws-mail.nsi
trunk/src/uninst-claws-mail.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
Log:
2007-07-02 Marcus Brinkmann <marcus at g10code.de>
* configure.ac: Add claws-mail.
* include/config.nsi.in: Add claws-mail.
* src/Makefile.am (gpg4win_spkgs): Add claws-mail.
(gpg4win_pkg_claws_mail_configure): New variable.
* src/inst-claws-mail.nsi, src/uninst-claws-mail.nsi: New files.
* src/inst-sections.nsi [HAVE_PKG_CLAws_MAIL]: Include installer
and uninstaller snippet for claws-mail, handle claws-mail
dependencies and add a menu item for it.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/ChangeLog 2007-07-02 17:33:19 UTC (rev 427)
@@ -1,3 +1,14 @@
+2007-07-02 Marcus Brinkmann <marcus at g10code.de>
+
+ * configure.ac: Add claws-mail.
+ * include/config.nsi.in: Add claws-mail.
+ * src/Makefile.am (gpg4win_spkgs): Add claws-mail.
+ (gpg4win_pkg_claws_mail_configure): New variable.
+ * src/inst-claws-mail.nsi, src/uninst-claws-mail.nsi: New files.
+ * src/inst-sections.nsi [HAVE_PKG_CLAws_MAIL]: Include installer
+ and uninstaller snippet for claws-mail, handle claws-mail
+ dependencies and add a menu item for it.
+
2007-06-22 Werner Koch <wk at g10code.com>
* src/inst-gnupg2.nsi: Install more files.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/configure.ac 2007-07-02 17:33:19 UTC (rev 427)
@@ -199,6 +199,8 @@
GPG4WIN_SPKG([winpt], [gpgme gnupg])
GPG4WIN_SPKG([sylpheed-claws], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
gpgme pthreads-w32 crypt regex])
+GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
+ gpgme pthreads-w32 crypt regex])
# The Eudora license (the one for the EMS API) is still not acceptable.
#GPG4WIN_SPKG([eudoragpg])
GPG4WIN_IPKG([man_novice_de])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/include/config.nsi.in 2007-07-02 17:33:19 UTC (rev 427)
@@ -107,6 +107,10 @@
!define gpg4win_pkg_sylpheed_claws @gpg4win_pkg_sylpheed_claws@
!define gpg4win_pkg_sylpheed_claws_version @gpg4win_pkg_sylpheed_claws_version@
+ at HAVE_PKG_CLAWS_MAIL@
+!define gpg4win_pkg_claws_mail @gpg4win_pkg_claws_mail@
+!define gpg4win_pkg_claws_mail_version @gpg4win_pkg_claws_mail_version@
+
#@HAVE_PKG_EUDORAGPG@
#!define gpg4win_pkg_eudoragpg @gpg4win_pkg_eudoragpg@
#!define gpg4win_pkg_eudoragpg_version @gpg4win_pkg_eudoragpg_version@
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/src/Makefile.am 2007-07-02 17:33:19 UTC (rev 427)
@@ -31,7 +31,8 @@
# Supported source packages.
gpg4win_spkgs = glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
- gnupg2 pinentry libassuan libksba libgcrypt w32pth
+ claws-mail gnupg2 pinentry libassuan libksba \
+ libgcrypt w32pth
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
@@ -99,7 +100,6 @@
--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 \
@@ -125,6 +125,17 @@
--disable-mathml-viewer-plugin --disable-clamav-plugin \
--disable-spamassassin-plugin
+gpg4win_pkg_claws_mail_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 \
+ --disable-libetpan --disable-aspell --disable-trayicon-plugin \
+ --disable-openssl --disable-dillo-viewer-plugin --disable-gnomeprint \
+ --disable-jpilot --disable-startup-notification --disable-ipv6 \
+ --disable-mathml-viewer-plugin --disable-clamav-plugin \
+ --disable-spamassassin-plugin --disable-bogofilter-plugin \
+ --disable-valgrind
+
# Supported make-only source packages.
gpg4win_mpkgs = pthreads-w32
Added: trunk/src/inst-claws-mail.nsi
===================================================================
--- trunk/src/inst-claws-mail.nsi 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/src/inst-claws-mail.nsi 2007-07-02 17:33:19 UTC (rev 427)
@@ -0,0 +1,60 @@
+# inst-claws-mail.nsi - Installer snippet for Claws. -*- 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}/claws-mail-${gpg4win_pkg_claws_mail_version}
+
+
+Section /o "Claws-Mail" SEC_claws_mail
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_claws_mail}"
+!else
+ File ${prefix}/bin/claws-mail.exe
+
+!ifndef GPG4WIN_LIGHT
+ File ${prefix}/share/doc/claws-mail/manual/en/claws-mail-manual.pdf
+!endif
+
+ SetOutPath "$INSTDIR\lib\claws-mail\plugins"
+ File ${prefix}/lib/claws-mail/plugins/pgpcore.dll
+ File ${prefix}/lib/claws-mail/plugins/pgpinline.dll
+ File ${prefix}/lib/claws-mail/plugins/pgpinline.deps
+ File ${prefix}/lib/claws-mail/plugins/pgpmime.dll
+ File ${prefix}/lib/claws-mail/plugins/pgpmime.deps
+ File ${prefix}/lib/claws-mail/plugins/smime.dll
+ File ${prefix}/lib/claws-mail/plugins/smime.deps
+
+ SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+ File ${prefix}/share/locale/de/LC_MESSAGES/claws-mail.mo
+!endif
+SectionEnd
+
+
+LangString DESC_SEC_claws_mail ${LANG_ENGLISH} \
+ "Claws Mail-User-Agent"
+
+LangString DESC_Menu_claws_mail ${LANG_ENGLISH} \
+ "Run the Claws mailprogram."
+
+LangString DESC_Menu_claws_mail_pdf ${LANG_ENGLISH} \
+ "Show the online manual of Claws Mail"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/src/inst-sections.nsi 2007-07-02 17:33:19 UTC (rev 427)
@@ -107,6 +107,9 @@
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!include "inst-sylpheed-claws.nsi"
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+!include "inst-claws-mail.nsi"
+!endif
#!ifdef HAVE_PKG_EUDORAGPG
#!include "inst-eudoragpg.nsi"
#!endif
@@ -143,6 +146,9 @@
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!include "uninst-sylpheed-claws.nsi"
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+!include "uninst-claws-mail.nsi"
+!endif
!ifdef HAVE_PKG_GPGEE
!include "uninst-gpgee.nsi"
!endif
@@ -365,6 +371,23 @@
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ !insertmacro SectionFlagIsSet ${SEC_claws_mail} ${SF_SELECTED} have_claws_mail skip_claws_mail
+ have_claws_mail:
+ !insertmacro SelectSection ${SEC_zlib}
+ !insertmacro SelectSection ${SEC_gtk_}
+ !insertmacro SelectSection ${SEC_libpng}
+ !insertmacro SelectSection ${SEC_jpeg}
+ !insertmacro SelectSection ${SEC_glib}
+ !insertmacro SelectSection ${SEC_gpgme}
+ !insertmacro SelectSection ${SEC_gnupg}
+ !insertmacro SelectSection ${SEC_pthreads_w32}
+ !insertmacro SelectSection ${SEC_crypt}
+ !insertmacro SelectSection ${SEC_regex}
+ skip_claws_mail:
+!endif
+
+
!ifdef HAVE_PKG_GTK_
!insertmacro SectionFlagIsSet ${SEC_gtk_} \
${SF_SELECTED} have_gtk_ skip_gtk_
@@ -545,6 +568,9 @@
!ifdef HAVE_PKG_SYLPHEED_CLAWS
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_sylpheed} $(DESC_SEC_sylpheed)
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_claws_mail} $(DESC_SEC_claws_mail)
+!endif
#!ifdef HAVE_PKG_EUDORAGPG
# !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
#!endif
@@ -617,6 +643,21 @@
no_sylpheed_menu:
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ SectionGetFlags ${SEC_claws_mail} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_claws_mail_menu
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Claws-Mail.lnk" \
+ "$INSTDIR\claws-mail.exe" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
+!ifndef GPG4WIN_LIGHT
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Claws-Mail Manual.lnk" \
+ "$INSTDIR\claws-mail-manual.pdf" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail_pdf)
+!endif
+ no_claws_mail_menu:
+!endif
+
#!ifdef HAVE_PKG_EUDORAGPG
# SectionGetFlags ${SEC_eudoragpg} $R0
# IntOp $R0 $R0 & ${SF_SELECTED}
@@ -740,6 +781,21 @@
no_sylpheed_desktop:
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ SectionGetFlags ${SEC_claws_mail} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_claws_mail_desktop
+ CreateShortCut "$DESKTOP\Claws-Mail.lnk" \
+ "$INSTDIR\claws-mail.exe" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
+!ifndef GPG4WIN_LIGHT
+ CreateShortCut "$DESKTOP\Claws-Mail Manual.lnk" \
+ "$INSTDIR\claws-mail-manual.pdf" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail_pdf)
+!endif
+ no_claws_mail_desktop:
+!endif
+
!ifdef HAVE_PKG_MAN_NOVICE_EN
SectionGetFlags ${SEC_man_novice_en} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -836,7 +892,17 @@
no_sylpheed_quicklaunch:
!endif
+!ifdef HAVE_PKG_CLAWS_MAIL
+ SectionGetFlags ${SEC_claws_mail} $R0
+ IntOp $R0 $R0 & ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} 0 no_claws_mail_quicklaunch
+ CreateShortCut "$QUICKLAUNCH\Claws-Mail.lnk" \
+ "$INSTDIR\claws-mail.exe" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_claws_mail)
+ no_claws_mail_quicklaunch:
+!endif
+
no_quick_launch:
Added: trunk/src/uninst-claws-mail.nsi
===================================================================
--- trunk/src/uninst-claws-mail.nsi 2007-06-29 14:19:29 UTC (rev 426)
+++ trunk/src/uninst-claws-mail.nsi 2007-07-02 17:33:19 UTC (rev 427)
@@ -0,0 +1,56 @@
+# uninst-claws-mail.nsi - Installer snippet. -*- 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}/claws-mail-${gpg4win_pkg_claws_mail_version}
+
+
+# Uninstaller section.
+Section "-un.claws-mail"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_claws_mail}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\claws-mail.exe"
+
+!ifndef GPG4WIN_LIGHT
+ Delete "$INSTDIR\claws-mail-manual.pdf"
+!endif
+
+ Delete "$INSTDIR\lib\claws-mail\plugins\pgpcore.dll"
+ Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.dll"
+ Delete "$INSTDIR\lib\claws-mail\plugins\pgpinline.deps"
+ Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.dll"
+ Delete "$INSTDIR\lib\claws-mail\plugins\pgpmime.deps"
+ Delete "$INSTDIR\lib\claws-mail\plugins\smime.dll"
+ Delete "$INSTDIR\lib\claws-mail\plugins\smime.deps"
+ RMDir "$INSTDIR\lib\claws-mail\plugins"
+ RMDir "$INSTDIR\lib\claws-mail"
+ RMDir "$INSTDIR\lib"
+
+ Delete "$INSTDIR\share\locale\de\LC_MESSAGES\claws-mail.mo"
+
+ RMDir "$INSTDIR\share\claws-mail"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+!endif
+SectionEnd
More information about the Gpg4win-commits
mailing list