[Gpg4win-commits] r1544 - in trunk: . include src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Sep 1 17:46:24 CEST 2010
Author: emanuel
Date: 2010-09-01 17:46:23 +0200 (Wed, 01 Sep 2010)
New Revision: 1544
Added:
trunk/src/inst-compendium.nsi
trunk/src/uninst-compendium.nsi
Removed:
trunk/src/inst-compendium_de.nsi
trunk/src/inst-compendium_en.nsi
trunk/src/uninst-compendium_de.nsi
trunk/src/uninst-compendium_en.nsi
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/config.nsi.in
trunk/src/Makefile.am
trunk/src/inst-sections.nsi
trunk/src/installer-finish.nsi
Log:
Merged compendium_de and compendium_en to one nsis compendium section. Changed new compendium-html path.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/ChangeLog 2010-09-01 15:46:23 UTC (rev 1544)
@@ -1,3 +1,14 @@
+2010-09-01 Emanuel Schuetze <emanuel at intevation.de>
+ * configure.ac, include/config.nsi.in, src/Makefile.am,
+ src/inst-sections.nsi, src/installer-finish.nsi,
+ src/uninst-compendium.nsi, src/uninst-compendium_de.nsi,
+ src/uninst-compendium_en.nsi, src/inst-compendium_de.nsi,
+ src/inst-compendium.nsi, src/inst-compendium_en.nsi:
+ Merged (un)inst-compendium_de and (un)inst-compendium_en
+ to one nsis section (un)inst-compendium.
+ Changed and install new compendium-html path.
+
+
2010-08-31 Emanuel Schuetze <emanuel at intevation.de>
* configure.ac: Updated compendium en version date.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/configure.ac 2010-09-01 15:46:23 UTC (rev 1544)
@@ -250,10 +250,7 @@
GPG4WIN_SPKG([tnef_parse], [claws-mail])
GPG4WIN_SPKG([attachwarner], [claws-mail])
GPG4WIN_SPKG([bsfilter_plugin], [claws-mail])
-GPG4WIN_IPKG([compendium_de])
-GPG4WIN_IPKG([compendium_en])
-#GPG4WIN_IPKG([man_novice_en])
-#GPG4WIN_IPKG([man_advanced_en])
+GPG4WIN_IPKG([compendium])
# Qt related stuff.
GPG4WIN_BPKG_GNUWIN32([kdesupport])
Modified: trunk/include/config.nsi.in
===================================================================
--- trunk/include/config.nsi.in 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/include/config.nsi.in 2010-09-01 15:46:23 UTC (rev 1544)
@@ -290,8 +290,7 @@
!define gpg4win_pkg_paperkey_version @gpg4win_pkg_paperkey_version@
# Internal packages.
- at HAVE_PKG_COMPENDIUM_DE@
- at HAVE_PKG_COMPENDIUM_EN@
+ at HAVE_PKG_COMPENDIUM@
# @HAVE_PKG_MAN_NOVICE_EN@
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/Makefile.am 2010-09-01 15:46:23 UTC (rev 1544)
@@ -62,8 +62,7 @@
inst-libksba.nsi uninst-libksba.nsi \
inst-adns.nsi uninst-adns.nsi \
inst-libpng.nsi uninst-libpng.nsi \
- inst-compendium_de.nsi uninst-compendium_de.nsi \
- inst-compendium_en.nsi uninst-compendium_en.nsi \
+ inst-compendium.nsi uninst-compendium.nsi \
inst-man_advanced_de.nsi uninst-man_advanced_de.nsi \
inst-man_advanced_en.nsi uninst-man_advanced_en.nsi \
inst-man_novice_de.nsi uninst-man_novice_de.nsi \
@@ -438,7 +437,7 @@
# special support. Thus, this variable is actually unused, and no
# rules are added in gpg4win.mk.
gpg4win_ipkgs = man_novice_de man_advanced_de man_novice_en man_advanced_en \
- compendium_de compendium_en
+ compendium
# Now do the bunch of the work. This is a bunch of dirty magic to
Copied: trunk/src/inst-compendium.nsi (from rev 1543, trunk/src/inst-compendium_de.nsi)
===================================================================
--- trunk/src/inst-compendium_de.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/inst-compendium.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -0,0 +1,75 @@
+# inst-compendium.nsi - Installer snippet -*- coding: latin-1; -*-
+# Copyright (C) 2008 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, see <http://www.gnu.org/licenses/>.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+
+
+${MementoSection} "$(DESC_Name_compendium)" SEC_compendium
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ # No need to include anything as the manuals are part of gpg4win
+!else
+
+ SetOutPath "$INSTDIR\share\gpg4win"
+ File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-*.pdf"
+ SetOutPath "$INSTDIR\share\gpg4win\compendium-html"
+ SetOutPath "$INSTDIR\share\gpg4win\compendium-html\images-hyperlatex"
+ File "${BUILD_DIR}/../doc/manual/compendium-html/images-hyperlatex/*"
+ SetOutPath "$INSTDIR\share\gpg4win\compendium-html\images-compendium"
+ File "${BUILD_DIR}/../doc/manual/compendium-html/images-compendium/*"
+ SetOutPath "$INSTDIR\share\gpg4win\compendium-html\de"
+ File "${BUILD_DIR}/../doc/manual/compendium-html/de/*"
+ SetOutPath "$INSTDIR\share\gpg4win\compendium-html\en"
+ File "${BUILD_DIR}/../doc/manual/compendium-html/en/*"
+!endif
+${MementoSectionEnd}
+
+
+# The name of the installer component.
+LangString DESC_Name_compendium ${LANG_ENGLISH} \
+ "Gpg4win Compendium"
+# The description text used in the installer components dialog.
+LangString DESC_SEC_compendium ${LANG_ENGLISH} \
+ "The Gpg4win documentation (English and German)"
+
+# The name of the PDF version of the link
+LangString DESC_Name_compendium_de_pdf ${LANG_ENGLISH} \
+ "Gpg4win Compendium (pdf, German)"
+LangString DESC_Name_compendium_en_pdf ${LANG_ENGLISH} \
+ "Gpg4win Compendium (pdf, English)"
+
+# The name of the HTML version of the link
+LangString DESC_Name_compendium_de_html ${LANG_ENGLISH} \
+ "Gpg4win Compendium (html, German)"
+LangString DESC_Name_compendium_en_html ${LANG_ENGLISH} \
+ "Gpg4win Compendium (html, English)"
+
+# The string displayed in the startmenu for the PDF version.
+LangString DESC_Menu_compendium_de_pdf ${LANG_ENGLISH} \
+ "Show the Gpg4win Compendium (pdf, German)"
+LangString DESC_Menu_compendium_en_pdf ${LANG_ENGLISH} \
+ "Show the Gpg4win Compendium (pdf, English)"
+
+# The string displayed in the startmenu for the HTML version.
+LangString DESC_Menu_compendium_de_html ${LANG_ENGLISH} \
+ "Show the Gpg4win Compendium (html, German)"
+LangString DESC_Menu_compendium_en_html ${LANG_ENGLISH} \
+ "Show the Gpg4win Compendium (html, English)"
Property changes on: trunk/src/inst-compendium.nsi
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/src/inst-compendium_de.nsi
===================================================================
--- trunk/src/inst-compendium_de.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/inst-compendium_de.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -1,62 +0,0 @@
-# inst-compendium_de.nsi - Installer snippet -*- coding: latin-1; -*-
-# Copyright (C) 2008 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, see <http://www.gnu.org/licenses/>.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-
-
-${MementoSection} "$(DESC_Name_compendium_de)" SEC_compendium_de
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- # No need to include anything as the manuals are part of gpg4win
-!else
-
- SetOutPath "$INSTDIR\share\gpg4win"
- File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-de.pdf"
- SetOutPath "$INSTDIR\share\gpg4win\html-de"
- File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-de.html.d/*"
-!endif
-${MementoSectionEnd}
-
-
-# The name of the link.
-LangString DESC_Name_compendium_de ${LANG_ENGLISH} \
- "Gpg4win Compendium DE"
-
-# The name of the PDF version of the link
-LangString DESC_Name_compendium_de_pdf ${LANG_ENGLISH} \
- "Gpg4win Compendium (pdf, German)"
-
-# The name of the HTML version of the link
-LangString DESC_Name_compendium_de_html ${LANG_ENGLISH} \
- "Gpg4win Compendium (html, German)"
-
-# The description text used in the installer components dialog.
-LangString DESC_SEC_compendium_de ${LANG_ENGLISH} \
- "Gpg4win Compendium (German)"
-
-# The string displayed in the startmenu for the PDF version.
-LangString DESC_Menu_compendium_de_pdf ${LANG_ENGLISH} \
- "Show the Gpg4win Compendium (pdf, German)"
-
-# The string displayed in the startmenu for the HTML version.
-LangString DESC_Menu_compendium_de_html ${LANG_ENGLISH} \
- "Show the Gpg4win Compendium (html, German)"
-
Deleted: trunk/src/inst-compendium_en.nsi
===================================================================
--- trunk/src/inst-compendium_en.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/inst-compendium_en.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -1,62 +0,0 @@
-# inst-compendium_en.nsi - Installer snippet -*- coding: latin-1; -*-
-# Copyright (C) 2010 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, see <http://www.gnu.org/licenses/>.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-
-
-${MementoSection} "$(DESC_Name_compendium_en)" SEC_compendium_en
- SetOutPath "$INSTDIR"
-!ifdef SOURCES
- # No need to include anything as the manuals are part of gpg4win
-!else
-
- SetOutPath "$INSTDIR\share\gpg4win"
- File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-en.pdf"
- SetOutPath "$INSTDIR\share\gpg4win\html-en"
- File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-en.html.d/*"
-!endif
-${MementoSectionEnd}
-
-
-# The name of the link.
-LangString DESC_Name_compendium_en ${LANG_ENGLISH} \
- "Gpg4win Compendium EN"
-
-# The name of the PDF version of the link
-LangString DESC_Name_compendium_en_pdf ${LANG_ENGLISH} \
- "Gpg4win Compendium (pdf, English)"
-
-# The name of the HTML version of the link
-LangString DESC_Name_compendium_en_html ${LANG_ENGLISH} \
- "Gpg4win Compendium (html, English)"
-
-# The description text used in the installer components dialog.
-LangString DESC_SEC_compendium_en ${LANG_ENGLISH} \
- "Gpg4win Compendium (English)"
-
-# The string displayed in the startmenu for the PDF version.
-LangString DESC_Menu_compendium_en_pdf ${LANG_ENGLISH} \
- "Show the Gpg4win Compendium (pdf, English)"
-
-# The string displayed in the startmenu for the HTML version.
-LangString DESC_Menu_compendium_en_html ${LANG_ENGLISH} \
- "Show the Gpg4win Compendium (html, English)"
-
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/inst-sections.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -185,12 +185,9 @@
!ifdef HAVE_PKG_BSFILTER_PLUGIN
!include "inst-bsfilter_plugin.nsi"
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
-!include "inst-compendium_de.nsi"
+!ifdef HAVE_PKG_COMPENDIUM
+!include "inst-compendium.nsi"
!endif
-!ifdef HAVE_PKG_COMPENDIUM_EN
-!include "inst-compendium_en.nsi"
-!endif
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "inst-man_novice_en.nsi"
!endif
@@ -220,12 +217,9 @@
!ifdef HAVE_PKG_MAN_NOVICE_EN
!include "uninst-man_novice_en.nsi"
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
-!include "uninst-compendium_de.nsi"
+!ifdef HAVE_PKG_COMPENDIUM
+!include "uninst-compendium.nsi"
!endif
-!ifdef HAVE_PKG_COMPENDIUM_EN
-!include "uninst-compendium_en.nsi"
-!endif
!ifdef HAVE_PKG_CLAWS_MAIL
!include "uninst-claws-mail.nsi"
!endif
@@ -503,27 +497,17 @@
calc_defaults_claws_mail_done:
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
- g4wihelp::config_fetch_bool "inst_compendium_de"
- StrCmp $R0 "1" 0 calc_defaults_compendium_de_not_one
- !insertmacro SelectSection ${SEC_compendium_de}
- Goto calc_defaults_compendium_de_done
- calc_defaults_compendium_de_not_one:
- StrCmp $R0 "0" 0 calc_defaults_compendium_de_done
- !insertmacro UnselectSection ${SEC_compendium_de}
-calc_defaults_compendium_de_done:
+!ifdef HAVE_PKG_COMPENDIUM
+ g4wihelp::config_fetch_bool "inst_compendium"
+ StrCmp $R0 "1" 0 calc_defaults_compendium_not_one
+ !insertmacro SelectSection ${SEC_compendium}
+ Goto calc_defaults_compendium_done
+ calc_defaults_compendium_not_one:
+ StrCmp $R0 "0" 0 calc_defaults_compendium_done
+ !insertmacro UnselectSection ${SEC_compendium}
+calc_defaults_compendium_done:
!endif
-!ifdef HAVE_PKG_COMPENDIUM_EN
- g4wihelp::config_fetch_bool "inst_compendium_en"
- StrCmp $R0 "1" 0 calc_defaults_compendium_en_not_one
- !insertmacro SelectSection ${SEC_compendium_en}
- Goto calc_defaults_compendium_en_done
- calc_defaults_compendium_en_not_one:
- StrCmp $R0 "0" 0 calc_defaults_compendium_en_done
- !insertmacro UnselectSection ${SEC_compendium_en}
-calc_defaults_compendium_en_done:
-!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
g4wihelp::config_fetch_bool "inst_man_novice_de"
@@ -1192,12 +1176,9 @@
!ifdef HAVE_PKG_MAN_ADVANCED_EN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_advanced_en} $(DESC_SEC_man_advanced_en)
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_compendium_de} $(DESC_SEC_compendium_de)
+!ifdef HAVE_PKG_COMPENDIUM
+ !insertmacro MUI_DESCRIPTION_TEXT ${SEC_compendium} $(DESC_SEC_compendium)
!endif
-!ifdef HAVE_PKG_COMPENDIUM_EN
- !insertmacro MUI_DESCRIPTION_TEXT ${SEC_compendium_en} $(DESC_SEC_compendium_en)
-!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_man_novice_de} $(DESC_SEC_man_novice_de)
!endif
@@ -1291,34 +1272,27 @@
no_man_advanced_en_menu:
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
- SectionGetFlags ${SEC_compendium_de} $R0
+!ifdef HAVE_PKG_COMPENDIUM
+ SectionGetFlags ${SEC_compendium} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_compendium_de_menu
+ IntCmp $R0 ${SF_SELECTED} 0 no_compendium_menu
CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de_html).lnk" \
- "$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+ "$INSTDIR\share\gpg4win\compendium-html\de\gpg4win-compendium.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de_html)
CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de_pdf).lnk" \
"$INSTDIR\share\gpg4win\gpg4win-compendium-de.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de_pdf)
- no_compendium_de_menu:
-!endif
-
-!ifdef HAVE_PKG_COMPENDIUM_EN
- SectionGetFlags ${SEC_compendium_en} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_compendium_en_menu
CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_en_html).lnk" \
- "$INSTDIR\share\gpg4win\html-en\gpg4win-compendium-en.html" \
+ "$INSTDIR\share\gpg4win\compendium-html\en\gpg4win-compendium.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_en_html)
CreateShortCut \
"$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_en_pdf).lnk" \
"$INSTDIR\share\gpg4win\gpg4win-compendium-en.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_en_pdf)
- no_compendium_en_menu:
+ no_compendium_menu:
!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
@@ -1460,34 +1434,27 @@
no_man_advanced_en_desktop:
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
- SectionGetFlags ${SEC_compendium_de} $R0
+!ifdef HAVE_PKG_COMPENDIUM
+ SectionGetFlags ${SEC_compendium} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_compendium_de_desktop
+ IntCmp $R0 ${SF_SELECTED} 0 no_compendium_desktop
CreateShortCut \
"$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk" \
- "$INSTDIR\share\gpg4win\html-de\gpg4win-compendium-de.html" \
+ "$INSTDIR\share\gpg4win\compendium-html\de\gpg4win-compendium.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de_html)
CreateShortCut \
"$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_pdf).lnk" \
"$INSTDIR\share\gpg4win\gpg4win-compendium-de.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_de_pdf)
- no_compendium_de_desktop:
-!endif
-
-!ifdef HAVE_PKG_COMPENDIUM_EN
- SectionGetFlags ${SEC_compendium_en} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_compendium_en_desktop
CreateShortCut \
"$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).lnk" \
- "$INSTDIR\share\gpg4win\html-en\gpg4win-compendium-en.html" \
+ "$INSTDIR\share\gpg4win\compendium-html\en\gpg4win-compendium.html" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_en_html)
CreateShortCut \
"$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_pdf).lnk" \
"$INSTDIR\share\gpg4win\gpg4win-compendium-en.pdf" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_compendium_en_pdf)
- no_compendium_en_desktop:
+ no_compendium_desktop:
!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
@@ -1534,8 +1501,8 @@
# We better delete also the name we used prior to 1.0.3
Delete "$QUICKLAUNCH\Sylpheed.lnk"
Delete "$QUICKLAUNCH\Claws-Mail.lnk"
- Delete "$QUICKLAUNCH\$(DESC_Name_compendium_de).lnk"
- Delete "$QUICKLAUNCH\$(DESC_Name_compendium_en).lnk"
+ Delete "$QUICKLAUNCH\$(DESC_Name_compendium).lnk"
+ Delete "$QUICKLAUNCH\$(DESC_Name_compendium).lnk"
Delete "$QUICKLAUNCH\$(DESC_Name_man_novice_de).lnk"
Delete "$QUICKLAUNCH\$(DESC_Name_man_advanced_de).lnk"
Delete "$QUICKLAUNCH\GPGee Manual.lnk"
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/installer-finish.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -109,11 +109,9 @@
Delete "$DESKTOP\Claws-Mail.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
+!ifdef HAVE_PKG_COMPENDIUM
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_pdf).lnk"
-!endif
-!ifdef HAVE_PKG_COMPENDIUM_EN
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_pdf).lnk"
!endif
@@ -152,10 +150,8 @@
!ifdef HAVE_PKG_CLAWS_MAIL
Delete "$QUICKLAUNCH\Claws-Mail.lnk"
!endif
-!ifdef HAVE_PKG_COMPENDIUM_DE
+!ifdef HAVE_PKG_COMPENDIUM
Delete "$QUICKLAUNCH\$(DESC_Name_compendium_de).lnk"
-!endif
-!ifdef HAVE_PKG_COMPENDIUM_EN
Delete "$QUICKLAUNCH\$(DESC_Name_compendium_en).lnk"
!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
Copied: trunk/src/uninst-compendium.nsi (from rev 1543, trunk/src/uninst-compendium_de.nsi)
===================================================================
--- trunk/src/uninst-compendium_de.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/uninst-compendium.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -0,0 +1,42 @@
+# uninst-compendium.nsi - Installer snippet. -*- coding: latin-1; -*-
+# Copyright (C) 2008 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, see <http://www.gnu.org/licenses/>.
+
+
+!ifdef prefix
+!undef prefix
+!endif
+
+; Uninstaller section.
+Section "-un.compendium"
+!ifdef SOURCES
+ #Push "${gpg4win_pkg_compendium}"
+ #Call un.SourceDelete
+!else
+
+ Delete "$INSTDIR\share\gpg4win\compendium-html\images-hyperlatex\*"
+ Delete "$INSTDIR\share\gpg4win\compendium-html\images-compendium\*"
+ Delete "$INSTDIR\share\gpg4win\compendium-html\de\*"
+ Delete "$INSTDIR\share\gpg4win\compendium-html\en\*"
+ RMDir "$INSTDIR\share\gpg4win\compendium-html"
+ Delete "$INSTDIR\share\gpg4win\gpg4win-compendium-*.pdf"
+ RMDir "$INSTDIR\share\gpg4win"
+ RMDir "$INSTDIR\share"
+ RMDir "$INSTDIR"
+
+!endif
+SectionEnd
Property changes on: trunk/src/uninst-compendium.nsi
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/src/uninst-compendium_de.nsi
===================================================================
--- trunk/src/uninst-compendium_de.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/uninst-compendium_de.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -1,39 +0,0 @@
-# uninst-compendium_de.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2008 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, see <http://www.gnu.org/licenses/>.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-
-; Uninstaller section.
-Section "-un.compendium_de"
-!ifdef SOURCES
- #Push "${gpg4win_pkg_compendium_de}"
- #Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\share\gpg4win\html-de\*"
- RMDir "$INSTDIR\share\gpg4win\html-de"
- Delete "$INSTDIR\share\gpg4win\gpg4win-compendium-de.pdf"
- RMDir "$INSTDIR\share\gpg4win"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
Deleted: trunk/src/uninst-compendium_en.nsi
===================================================================
--- trunk/src/uninst-compendium_en.nsi 2010-09-01 13:16:37 UTC (rev 1543)
+++ trunk/src/uninst-compendium_en.nsi 2010-09-01 15:46:23 UTC (rev 1544)
@@ -1,39 +0,0 @@
-# uninst-compendium_en.nsi - Installer snippet. -*- coding: latin-1; -*-
-# Copyright (C) 2010 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, see <http://www.gnu.org/licenses/>.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-
-; Uninstaller section.
-Section "-un.compendium_en"
-!ifdef SOURCES
- #Push "${gpg4win_pkg_compendium_en}"
- #Call un.SourceDelete
-!else
-
- Delete "$INSTDIR\share\gpg4win\html-en\*"
- RMDir "$INSTDIR\share\gpg4win\html-en"
- Delete "$INSTDIR\share\gpg4win\gpg4win-compendium-en.pdf"
- RMDir "$INSTDIR\share\gpg4win"
- RMDir "$INSTDIR\share"
- RMDir "$INSTDIR"
-
-!endif
-SectionEnd
More information about the Gpg4win-commits
mailing list