[Gpg4win-commits] r1619 - in trunk: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jan 19 15:58:44 CET 2011
Author: emanuel
Date: 2011-01-19 15:58:44 +0100 (Wed, 19 Jan 2011)
New Revision: 1619
Modified:
trunk/ChangeLog
trunk/src/gpg4win.nsi
trunk/src/inst-compendium.nsi
trunk/src/inst-sections.nsi
trunk/src/installer-finish.nsi
trunk/src/uninst-compendium.nsi
Log:
Install and uninstall some compendium stuff.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-01-19 14:52:08 UTC (rev 1618)
+++ trunk/ChangeLog 2011-01-19 14:58:44 UTC (rev 1619)
@@ -3,6 +3,12 @@
* src/inst-gpa.nsi: Unselect GPA by default in gpg4win full installer.
(Still selected in light installer.)
+ * src/uninst-compendium.nsi, src/gpg4win.nsi, src/inst-sections.nsi,
+ src/inst-compendium.nsi, src/installer-finish.nsi:
+ Install and uninstall some compendium stuff (add new compendium
+ weblink to Startmenu and Desktop, remove compendium-html install
+ files, improve update process for readme and compendium files etc.)
+
2011-01-18 Werner Koch <wk at g10code.com>
* src/gpg4win.nsi: s/HAVE_PKG_COMPENDIUM_DE/HAVE_PKG_COMPENDIUM/.
Modified: trunk/src/gpg4win.nsi
===================================================================
--- trunk/src/gpg4win.nsi 2011-01-19 14:52:08 UTC (rev 1618)
+++ trunk/src/gpg4win.nsi 2011-01-19 14:58:44 UTC (rev 1619)
@@ -30,9 +30,6 @@
!ifdef HAVE_PKG_COMPENDIUM
!undef HAVE_PKG_COMPENDIUM
!endif
-!ifdef HAVE_PKG_MAN_NOVICE_EN
-!undef HAVE_PKG_MAN_NOVICE_EN
-!endif
!ifdef HAVE_PKG_KLEOPATRA
!undef HAVE_PKG_KLEOPATRA
!endif
Modified: trunk/src/inst-compendium.nsi
===================================================================
--- trunk/src/inst-compendium.nsi 2011-01-19 14:52:08 UTC (rev 1618)
+++ trunk/src/inst-compendium.nsi 2011-01-19 14:58:44 UTC (rev 1619)
@@ -30,15 +30,6 @@
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}
@@ -67,9 +58,3 @@
"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)"
Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi 2011-01-19 14:52:08 UTC (rev 1618)
+++ trunk/src/inst-sections.nsi 2011-01-19 14:58:44 UTC (rev 1619)
@@ -1227,7 +1227,8 @@
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
# Delete the old stuff.
- Delete "$SMPROGRAMS\$STARTMENU_FOLDER\*.lnk"
+ Delete "$SMPROGRAMS\$STARTMENU_FOLDER\*"
+ Delete "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\*"
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)"
@@ -1295,21 +1296,19 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_compendium_menu
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de_html).lnk" \
- "$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)
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_en_html).lnk" \
- "$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)
+ WriteINIStr \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_de_html).url" \
+ "InternetShortcut" "URL" "http://www.gpg4win.org/doc/de/gpg4win-compendium.html"
+ WriteINIStr \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_compendium_en_html).url" \
+ "InternetShortcut" "URL" "http://www.gpg4win.org/doc/en/gpg4win-compendium.html"
no_compendium_menu:
!endif
@@ -1341,25 +1340,27 @@
# "$INSTDIR\share\gnupg\faq.html" \
# "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4Win README.lnk" \
- "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
StrCmp $LANGUAGE ${LANG_GERMAN} 0 +7
# German
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4Win HOWTO SMIME.lnk" \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4win HOWTO SMIME.lnk" \
"$INSTDIR\share\gpg4win\HOWTO-SMIME.de.txt" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
- Goto leave
+ Goto leaveHowtosmimeStartmenu
# English
CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4Win HOWTO SMIME.lnk" \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4win HOWTO SMIME.lnk" \
"$INSTDIR\share\gpg4win\HOWTO-SMIME.en.txt" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
- leave:
-
+ leaveHowtosmimeStartmenu:
+
+ CreateShortCut \
+ "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4win README.lnk" \
+ "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
+
+
# No more uninstall link because Windows has its own feature to call
# the uninstaller.
# CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \
@@ -1397,14 +1398,18 @@
Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_pdf).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).url"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_pdf).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).url"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\GPGee Manual.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\GnuPG FAQ.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4Win README.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win README.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win HOWTO SMIME.lnk"
CreateDirectory "$DESKTOP\$(DESC_Desktop_manuals)"
@@ -1471,21 +1476,19 @@
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_compendium_desktop
CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk" \
- "$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)
CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).lnk" \
- "$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)
+ WriteINIStr \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).url" \
+ "InternetShortcut" "URL" "http://www.gpg4win.org/doc/de/gpg4win-compendium.html"
+ WriteINIStr \
+ "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).url" \
+ "InternetShortcut" "URL" "http://www.gpg4win.org/doc/en/gpg4win-compendium.html"
no_compendium_desktop:
!endif
@@ -1516,6 +1519,25 @@
# "$INSTDIR\share\gnupg\faq.html" \
# "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win README.lnk" \
+ "$INSTDIR\share\gpg4win\README.$(T_LangCode).txt" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_readme)
+
+ StrCmp $LANGUAGE ${LANG_GERMAN} 0 +7
+ # German
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win HOWTO SMIME.lnk" \
+ "$INSTDIR\share\gpg4win\HOWTO-SMIME.de.txt" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
+ Goto leaveHowtosmimeDesktop
+ # English
+ CreateShortCut \
+ "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win HOWTO SMIME.lnk" \
+ "$INSTDIR\share\gpg4win\HOWTO-SMIME.en.txt" \
+ "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
+ leaveHowtosmimeDesktop:
+
no_desktop:
Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi 2011-01-19 14:52:08 UTC (rev 1618)
+++ trunk/src/installer-finish.nsi 2011-01-19 14:58:44 UTC (rev 1619)
@@ -72,7 +72,7 @@
StrCmp $R0 "" +2
StrCpy $MYTMP $R0
Delete "$SMPROGRAMS\$MYTMP\*.lnk"
- Delete "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)\*.lnk"
+ Delete "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)\*"
RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)"
RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Desktop_manuals)"
@@ -111,8 +111,10 @@
!endif
!ifdef HAVE_PKG_COMPENDIUM
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_html).url"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_de_pdf).lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_html).url"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_compendium_en_pdf).lnk"
!endif
!ifdef HAVE_PKG_MAN_NOVICE_DE
@@ -129,6 +131,8 @@
!endif
Delete "$DESKTOP\$(DESC_Desktop_manuals)\GnuPG FAQ.lnk"
Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4Win README.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win README.lnk"
+ Delete "$DESKTOP\$(DESC_Desktop_manuals)\Gpg4win HOWTO SMIME.lnk"
RMDir "$DESKTOP\$(DESC_Desktop_manuals)"
# Delete Quick Launch Bar links.
Modified: trunk/src/uninst-compendium.nsi
===================================================================
--- trunk/src/uninst-compendium.nsi 2011-01-19 14:52:08 UTC (rev 1618)
+++ trunk/src/uninst-compendium.nsi 2011-01-19 14:58:44 UTC (rev 1619)
@@ -28,6 +28,11 @@
#Call un.SourceDelete
!else
+ # delete old compendium stuff of previous gpg4win versions
+ Delete "$INSTDIR\share\gpg4win\html-de\*"
+ RMDir "$INSTDIR\share\gpg4win\html-de"
+
+ # delete current compendium files and folders
Delete "$INSTDIR\share\gpg4win\compendium-html\images-hyperlatex\*"
RMDir "$INSTDIR\share\gpg4win\compendium-html\images-hyperlatex"
Delete "$INSTDIR\share\gpg4win\compendium-html\images-compendium\*"
@@ -42,5 +47,6 @@
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
+
!endif
SectionEnd
More information about the Gpg4win-commits
mailing list