[Gpg4win-commits] r540 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-09-25 19:11:40 +0200 (Tue, 25 Sep 2007)
New Revision: 540

Modified:
   trunk/ChangeLog
   trunk/src/inst-gpgex.nsi
   trunk/src/inst-kleopatra.nsi
   trunk/src/inst-sections.nsi
Log:
2007-09-25  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-sections.nsi, src/inst-kleopatra.nsi,
	src/inst-gpgex.nsi: Some bug fixes.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-25 16:39:45 UTC (rev 539)
+++ trunk/ChangeLog	2007-09-25 17:11:40 UTC (rev 540)
@@ -1,5 +1,8 @@
 2007-09-25  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/inst-sections.nsi, src/inst-kleopatra.nsi,
+	src/inst-gpgex.nsi: Some bug fixes.
+
 	* configure.ac: Add check for kleopatra.
 	* include/config.nsi.in: Add macros for kleopatra.
 	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: New files.

Modified: trunk/src/inst-gpgex.nsi
===================================================================
--- trunk/src/inst-gpgex.nsi	2007-09-25 16:39:45 UTC (rev 539)
+++ trunk/src/inst-gpgex.nsi	2007-09-25 17:11:40 UTC (rev 540)
@@ -23,7 +23,7 @@
 !define prefix ${ipdir}/gpgex-${gpg4win_pkg_gpgex_version}
 
 
-Section "GpgEX" SEC_gpgex
+Section /o "GpgEX" SEC_gpgex
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgex}"

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2007-09-25 16:39:45 UTC (rev 539)
+++ trunk/src/inst-kleopatra.nsi	2007-09-25 17:11:40 UTC (rev 540)
@@ -23,7 +23,7 @@
 !endif
 !define prefix ${ipdir}/kleopatra-${gpg4win_pkg_kleopatra_version}
 
-Section "kleopatra" SEC_kleopatra
+Section /o "Kleopatra" SEC_kleopatra
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_kleopatra_src}"
@@ -72,3 +72,7 @@
 
 !endif
 SectionEnd
+
+
+LangString DESC_SEC_kleopatra ${LANG_ENGLISH} \
+   "Kleopatra"

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2007-09-25 16:39:45 UTC (rev 539)
+++ trunk/src/inst-sections.nsi	2007-09-25 17:11:40 UTC (rev 540)
@@ -303,6 +303,17 @@
 
 
 
+!ifdef HAVE_PKG_KLEOPATRA
+  g4wihelp::config_fetch_bool "inst_kleopatra"
+  StrCmp $R0 "1" 0 calc_defaults_kleopatra_not_one
+   !insertmacro SelectSection ${SEC_kleopatra}
+   Goto calc_defaults_kleopatra_done
+  calc_defaults_kleopatra_not_one:
+  StrCmp $R0 "0" 0 calc_defaults_kleopatra_done
+   !insertmacro UnselectSection ${SEC_kleopatra}
+calc_defaults_kleopatra_done:
+!endif
+
 !ifdef HAVE_PKG_GNUPG2
   g4wihelp::config_fetch_bool "inst_gnupg2"
   StrCmp $R0 "1" 0 calc_defaults_gnupg2_not_one
@@ -514,12 +525,19 @@
 
   # Then enable all dependencies in reverse build list order!
 
+!ifdef HAVE_PKG_GPGEX
+  !insertmacro SectionFlagIsSet ${SEC_gpgex} \
+		${SF_SELECTED} have_gpgex skip_gpgex
+  have_gpgex:
+  !insertmacro SelectSection ${SEC_kleopatra}
+  skip_gpgex:
+!endif
+
 !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:
@@ -653,14 +671,6 @@
   skip_gpgol:
 !endif
 
-!ifdef HAVE_PKG_GPGEX
-  !insertmacro SectionFlagIsSet ${SEC_gpgex} \
-		${SF_SELECTED} have_gpgex skip_gpgex
-  have_gpgex:
-  !insertmacro SelectSection ${SEC_kleopatra}
-  skip_gpgex:
-!endif
-
 !ifdef HAVE_PKG_LIBPNG
   !insertmacro SectionFlagIsSet ${SEC_libpng} \
 		${SF_SELECTED} have_libpng skip_libpng
@@ -840,6 +850,9 @@
 #!ifdef HAVE_PKG_EUDORAGPG
 #  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_eudoragpg} $(DESC_SEC_eudoragpg)
 #!endif
+!ifdef HAVE_PKG_KLEOPATRA
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_kleopatra} $(DESC_SEC_kleopatra)
+!endif
 !ifdef HAVE_PKG_MAN_NOVICE_EN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_en} $(DESC_SEC_man_novice_en)
 !endif