[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.0-98-g6582329
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Feb 29 11:12:31 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 6582329a5227cef1a160047ab416b7899cdcb13d (commit)
via 40df05213fa0760811e780a0d8bfd95b2b9af5f1 (commit)
via b799151946d37844bac9fd636ddf52629e088067 (commit)
via 8c6859b8c21d55c45ed4a2bb06e715afe24bb86a (commit)
via c39c6a78788cabba144ada1f0fe3f7ffca158857 (commit)
via 9b488ec6444fa5d9fdb3c6ae4e73b970354b8d81 (commit)
from 2635df7aed7aac81dc7983c3651b9ad660f10dd3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6582329a5227cef1a160047ab416b7899cdcb13d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Feb 29 11:09:56 2016 +0100
Simplify start menu entries
* src/inst-sections.nsi: Remove old removal code. Remove Manual
links. Install Kleopatra/GPA entries in top level.
* src/installer-finish.nsi: Remove start menu entry removal.
* src/installer.nsi: Remove start menu page.
--
We might want to add a custom installation option that will allow
to select startmenu again. But installing many start menu entries in
a subfolder is no longer state of the art for Windows.
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index ba43d0c..2f3c5db 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -1052,7 +1052,6 @@ Section "-startmenu"
# NOT SetOutPath.
StrCpy $OUTDIR "%HOMEDRIVE%%HOMEPATH%"
-!ifdef HAVE_STARTMENU
# Make sure that the context of the automatic variables has been set to
# the "all users" shell folder. This guarantees that the menu gets written
# for all users. We have already checked that we are running as Admin; or
@@ -1064,19 +1063,11 @@ Section "-startmenu"
"Field 2" "State"
IntCmp $R0 0 no_start_menu
-!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
- # Delete the old stuff.
- Delete "$SMPROGRAMS\$STARTMENU_FOLDER\*"
- Delete "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\*"
-
- CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
- CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)"
-
!ifdef HAVE_PKG_GPA
SectionGetFlags ${SEC_gpa} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_gpa_menu
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GPA.lnk" \
+ CreateShortCut "$SMPROGRAMS\GPA.lnk" \
"$INSTDIR\bin\gpa.exe" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpa)
no_gpa_menu:
@@ -1086,162 +1077,25 @@ Section "-startmenu"
SectionGetFlags ${SEC_kleopatra} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_menu
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Kleopatra.lnk" \
+ CreateShortCut "$SMPROGRAMS\Kleopatra.lnk" \
"$INSTDIR\bin\kleopatra.exe" \
"" "$INSTDIR\bin\kleopatra.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
no_kleopatra_menu:
!endif
-!ifdef HAVE_PKG_MAN_NOVICE_EN
- SectionGetFlags ${SEC_man_novice_en} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_en_menu
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_novice_en).lnk" \
- "$INSTDIR\share\gpg4win\novices.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_en)
- no_man_novice_en_menu:
-!endif
-
-!ifdef HAVE_PKG_MAN_ADVANCED_EN
- SectionGetFlags ${SEC_man_advanced_en} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_en_menu
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_advanced_en).lnk" \
- "$INSTDIR\share\gpg4win\advanced.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_en)
- no_man_advanced_en_menu:
-!endif
-
-!ifdef HAVE_PKG_COMPENDIUM
- SectionGetFlags ${SEC_compendium} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_compendium_menu
- 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_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
-
-!ifdef HAVE_PKG_MAN_NOVICE_DE
- SectionGetFlags ${SEC_man_novice_de} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_menu
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_novice_de).lnk" \
- "$INSTDIR\share\gpg4win\einsteiger.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
- no_man_novice_de_menu:
-!endif
-
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
- SectionGetFlags ${SEC_man_advanced_de} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_menu
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\$(DESC_Name_man_advanced_de).lnk" \
- "$INSTDIR\share\gpg4win\durchblicker.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
- no_man_advanced_de_menu:
-!endif
-
-# The FAQ is totally outdated, better don't show it.
-# CreateShortCut \
-# "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\GnuPG FAQ.lnk" \
-# "$INSTDIR\share\gnupg\faq.html" \
-# "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gnupg_faq)
-
-
- StrCmp $LANGUAGE ${LANG_GERMAN} 0 +3
- # German
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4win HOWTO SMIME.lnk" \
- "$INSTDIR\share\gpg4win\HOWTO-SMIME.de.txt" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
- Goto leaveHowtosmimeStartmenu
- # English
- CreateShortCut \
- "$SMPROGRAMS\$STARTMENU_FOLDER\$(DESC_Menu_manuals)\Gpg4win HOWTO SMIME.lnk" \
- "$INSTDIR\share\gpg4win\HOWTO-SMIME.en.txt" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpg4win_howtosmime)
- 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" \
-# "$INSTDIR\${PACKAGE}-uninstall.exe"
-!insertmacro MUI_STARTMENU_WRITE_END
-
no_start_menu:
-
-
# Check if the desktop entries where requested.
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
"Field 3" "State"
IntCmp $R0 0 no_desktop
- # Delete the old stuff, also old names of previous versions.
- Delete "$DESKTOP\WinPT.lnk"
- Delete "$DESKTOP\GPA.lnk"
- Delete "$DESKTOP\Kleopatra.lnk"
- Delete "$DESKTOP\Sylpheed-Claws.lnk"
- Delete "$DESKTOP\Sylpheed-Claws Manual.lnk"
- Delete "$DESKTOP\Sylpheed.lnk"
- Delete "$DESKTOP\Claws-Mail.lnk"
- Delete "$DESKTOP\Claws-Mail Manual.lnk"
- Delete "$DESKTOP\$(DESC_Name_compendium_de_pdf).lnk"
- Delete "$DESKTOP\$(DESC_Name_compendium_de_html).lnk"
- Delete "$DESKTOP\$(DESC_Name_compendium_en_pdf).lnk"
- Delete "$DESKTOP\$(DESC_Name_compendium_en_html).lnk"
- Delete "$DESKTOP\$(DESC_Name_man_novice_de).lnk"
- Delete "$DESKTOP\$(DESC_Name_man_novice_en).lnk"
- Delete "$DESKTOP\$(DESC_Name_man_advanced_de).lnk"
- Delete "$DESKTOP\GPGee Manual.lnk"
- Delete "$DESKTOP\GnuPG FAQ.lnk"
- Delete "$DESKTOP\Gpg4Win README.lnk"
- 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)"
-
!ifdef HAVE_PKG_GPA
SectionGetFlags ${SEC_gpa} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_gpa_desktop
CreateShortCut "$DESKTOP\GPA.lnk" \
- "$INSTDIR\gpa.exe" \
+ "$INSTDIR\bin\gpa.exe" \
"" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpa)
no_gpa_desktop:
!endif
@@ -1251,151 +1105,11 @@ Section "-startmenu"
IntOp $R0 $R0 & ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_desktop
CreateShortCut "$DESKTOP\Kleopatra.lnk" \
- "$INSTDIR\kleopatra.exe" \
+ "$INSTDIR\bin\kleopatra.exe" \
"" "$INSTDIR\bin\kleopatra.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
no_kleopatra_desktop:
!endif
-!ifdef HAVE_PKG_MAN_NOVICE_EN
- SectionGetFlags ${SEC_man_novice_en} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_en_desktop
- CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk" \
- "$INSTDIR\share\gpg4win\novices.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_en)
- no_man_novice_en_desktop:
-!endif
-
-!ifdef HAVE_PKG_MAN_ADVANCED_EN
- SectionGetFlags ${SEC_man_advanced_en} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_en_desktop
- CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_en).lnk" \
- "$INSTDIR\share\gpg4win\advanced.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_en)
- no_man_advanced_en_desktop:
-!endif
-
-!ifdef HAVE_PKG_COMPENDIUM
- SectionGetFlags ${SEC_compendium} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_compendium_desktop
- 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_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
-
-!ifdef HAVE_PKG_MAN_NOVICE_DE
- SectionGetFlags ${SEC_man_novice_de} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_novice_de_desktop
- CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk" \
- "$INSTDIR\share\gpg4win\einsteiger.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_novice_de)
- no_man_novice_de_desktop:
-!endif
-
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
- SectionGetFlags ${SEC_man_advanced_de} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_man_advanced_de_desktop
- CreateShortCut \
- "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk" \
- "$INSTDIR\share\gpg4win\durchblicker.pdf" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_man_advanced_de)
- no_man_advanced_de_desktop:
-!endif
-
-# The GnuPG FAQ is totally out of date
-# CreateShortCut "$DESKTOP\$(DESC_Desktop_manuals)\GnuPG FAQ.lnk" \
-# "$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 +3
- # 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:
-
- # Check if the quick launch bar entries where requested.
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
- "Field 4" "State"
- IntCmp $R0 0 no_quick_launch
- StrCmp $QUICKLAUNCH $TEMP no_quick_launch
-
- # Delete old Quick Launch Bar links.
- Delete "$QUICKLAUNCH\WinPT.lnk"
- Delete "$QUICKLAUNCH\GPA.lnk"
- Delete "$QUICKLAUNCH\Kleopatra.lnk"
- Delete "$QUICKLAUNCH\Sylpheed-Claws.lnk"
- # 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).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"
- Delete "$QUICKLAUNCH\GnuPG FAQ.lnk"
- Delete "$QUICKLAUNCH\Gpg4Win README.lnk"
-
-!ifdef HAVE_PKG_GPA
- SectionGetFlags ${SEC_gpa} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_gpa_quicklaunch
- CreateShortCut "$QUICKLAUNCH\GPA.lnk" \
- "$INSTDIR\gpa.exe" \
- "" "" "" SW_SHOWNORMAL "" $(DESC_Menu_gpa)
- no_gpa_quicklaunch:
-!endif
-
-!ifdef HAVE_PKG_KLEOPATRA
- SectionGetFlags ${SEC_kleopatra} $R0
- IntOp $R0 $R0 & ${SF_SELECTED}
- IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_quicklaunch
- CreateShortCut "$QUICKLAUNCH\Kleopatra.lnk" \
- "$INSTDIR\kleopatra.exe" \
- "" "$INSTDIR\bin\kleopatra.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
- no_kleopatra_quicklaunch:
-!endif
-
-no_quick_launch:
-
-
-!endif
SectionEnd
-
-
-# FIXME: Now write desktop and quick launch bar.
-# Don't forget to delete the corr. entries in installer-finish. Uninstall.
diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index fce3868..60996e7 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -43,7 +43,6 @@ SectionEnd
Section Uninstall
-!ifdef HAVE_STARTMENU
# Make sure that the context of the automatic variables has been set to
# the "all users" shell folder. This guarantees that the menu gets written
# for all users. We have already checked that we are running as Admin; or
@@ -53,111 +52,16 @@ Section Uninstall
#---------------------------------------------------
# Delete the menu entries and any empty parent menus
#---------------------------------------------------
- !insertmacro MUI_STARTMENU_GETFOLDER Application $MYTMP
- g4wihelp::config_fetch "inst_start_menu_folder"
- StrCmp $R0 "" +2
- StrCpy $MYTMP $R0
- Delete "$SMPROGRAMS\$MYTMP\*.lnk"
- Delete "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)\*"
- RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)"
-
- RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Desktop_manuals)"
- StrCpy $MYTMP "$SMPROGRAMS\$MYTMP"
- startMenuDeleteLoop:
- ClearErrors
- RMDir $MYTMP
- GetFullPathName $MYTMP "$MYTMP\.."
- IfErrors startMenuDeleteLoopDone
- StrCmp $MYTMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
- startMenuDeleteLoopDone:
-
- DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
- "Start Menu Folder"
-
+ Delete "$SMPROGRAMS\GPA.lnk"
+ Delete "$SMPROGRAMS\Kleopatra.lnk"
# Delete Desktop links.
-!ifdef HAVE_PKG_WINPT
- Delete "$DESKTOP\WinPT.lnk"
-!endif
!ifdef HAVE_PKG_GPA
Delete "$DESKTOP\GPA.lnk"
!endif
!ifdef HAVE_PKG_KLEOPATRA
Delete "$DESKTOP\Kleopatra.lnk"
!endif
-!ifdef HAVE_PKG_SYLPHEED_CLAWS
- Delete "$DESKTOP\Sylpheed-Claws.lnk"
- Delete "$DESKTOP\Sylpheed-Claws Manual.lnk" \
- # We better delete also the name we used prior to 1.0.3
- Delete "$DESKTOP\Sylpheed.lnk"
-!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- Delete "$DESKTOP\Claws-Mail.lnk"
- Delete "$DESKTOP\$(DESC_Desktop_manuals)\Claws-Mail Manual.lnk"
-!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
- Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
-!endif
-!ifdef HAVE_PKG_MAN_NOVICE_EN
- Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_en).lnk"
-!endif
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
- Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_advanced_de).lnk"
-!endif
-!ifdef HAVE_PKG_GPGEE
- Delete "$DESKTOP\$(DESC_Desktop_manuals)\GPGee Manual.lnk"
-!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.
- StrCmp $QUICKLAUNCH $TEMP no_quick_launch_uninstall
-!ifdef HAVE_PKG_WINPT
- Delete "$QUICKLAUNCH\WinPT.lnk"
-!endif
-!ifdef HAVE_PKG_GPA
- Delete "$QUICKLAUNCH\GPA.lnk"
-!endif
-!ifdef HAVE_PKG_KLEOPATRA
- Delete "$QUICKLAUNCH\Kleopatra.lnk"
-!endif
-!ifdef HAVE_PKG_SYLPHEED_CLAWS
- Delete "$QUICKLAUNCH\Sylpheed-Claws.lnk"
- # We better delete also the name we used prior to 1.0.3
- Delete "$QUICKLAUNCH\Sylpheed.lnk"
-!endif
-!ifdef HAVE_PKG_CLAWS_MAIL
- Delete "$QUICKLAUNCH\Claws-Mail.lnk"
-!endif
-!ifdef HAVE_PKG_COMPENDIUM
- Delete "$QUICKLAUNCH\$(DESC_Name_compendium_de).lnk"
- Delete "$QUICKLAUNCH\$(DESC_Name_compendium_en).lnk"
-!endif
-!ifdef HAVE_PKG_MAN_NOVICE_DE
- Delete "$QUICKLAUNCH\$(DESC_Name_man_novice_de).lnk"
-!endif
-!ifdef HAVE_PKG_MAN_ADVANCED_DE
- Delete "$QUICKLAUNCH\$(DESC_Name_man_advanced_de).lnk"
-!endif
-!ifdef HAVE_PKG_GPGEE
- Delete "$QUICKLAUNCH\GPGee Manual.lnk"
-!endif
- Delete "$QUICKLAUNCH\GnuPG FAQ.lnk"
- Delete "$QUICKLAUNCH\Gpg4Win README.lnk"
-no_quick_launch_uninstall:
-
-!endif
Delete "$INSTDIR\${PACKAGE}-uninstall.exe"
RMDir "$INSTDIR"
diff --git a/src/installer.nsi b/src/installer.nsi
index ab89c33..62f350b 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -158,22 +158,6 @@ Bitte die Sprache des Installations-Vorgangs angeben."
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckExistingVersion
!insertmacro MUI_PAGE_DIRECTORY
-!ifdef HAVE_STARTMENU
-
-Page custom CustomPageOptions
-
-Var STARTMENU_FOLDER
-
-!define MUI_PAGE_CUSTOMFUNCTION_PRE CheckIfStartMenuWanted
-!define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${PRETTY_PACKAGE_SHORT}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-
-!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-!endif
-
!define MUI_PAGE_CUSTOMFUNCTION_PRE BeforeInstallHooks
!insertmacro MUI_PAGE_INSTFILES
!define MUI_PAGE_CUSTOMFUNCTION_PRE ShowFinalWarnings
commit 40df05213fa0760811e780a0d8bfd95b2b9af5f1
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Feb 29 11:07:46 2016 +0100
Set Kleopatra language according to installer lang
* src/inst-kleopatra.nsi: Write klanguageoverridesrc.
* src/uninst-kleopatra.nsi: Remove it.
--
Probably better to use system locale, but for now make the old
code that set it according to installer work again.
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index 7d40bdf..bbb2f23 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -211,15 +211,59 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
# weird effects like no toolbar icons.
FileWrite $1 '[Icons]$\r$\n'
FileWrite $1 'Theme=breeze$\r$\n$\r$\n'
- FileWrite $1 '[Locale] $\r$\n'
+ FileClose $1
+ pop $1
+
+ push $1
+ FileOpen $1 "$INSTDIR\share\klanguageoverridesrc" "w"
+ FileWrite $1 '[Language] $\r$\n'
StrCmp $LANGUAGE "1031" german_locale 0
- FileWrite $1 'Country=en $\r$\n'
- FileWrite $1 'Language=en_US $\r$\n'
- Goto kdeglobals_done
+ StrCmp $LANGUAGE "1025" arabic 0
+ StrCmp $LANGUAGE "1029" czech 0
+ StrCmp $LANGUAGE "1049" russian 0
+ StrCmp $LANGUAGE "1036" french 0
+ StrCmp $LANGUAGE "1034" spanish 0
+ StrCmp $LANGUAGE "1040" italian 0
+ StrCmp $LANGUAGE "1046" portugese 0
+ StrCmp $LANGUAGE "2070" portugese_br 0
+ StrCmp $LANGUAGE "2052" simpchinese 0
+ StrCmp $LANGUAGE "1028" tradchinese 0
+ FileWrite $1 'kleopatra=@ByteArray(en) $\r$\n'
+ Goto lang_done
german_locale:
- FileWrite $1 'Country=de $\r$\n'
- FileWrite $1 'Language=de $\r$\n'
-kdeglobals_done:
+ FileWrite $1 'kleopatra=@ByteArray(de) $\r$\n'
+ Goto lang_done
+arabic:
+ FileWrite $1 'kleopatra=@ByteArray(ar) $\r$\n'
+ Goto lang_done
+czech:
+ FileWrite $1 'kleopatra=@ByteArray(cs) $\r$\n'
+ Goto lang_done
+russian:
+ FileWrite $1 'kleopatra=@ByteArray(ru) $\r$\n'
+ Goto lang_done
+french:
+ FileWrite $1 'kleopatra=@ByteArray(fr) $\r$\n'
+ Goto lang_done
+spanish:
+ FileWrite $1 'kleopatra=@ByteArray(es) $\r$\n'
+ Goto lang_done
+italian:
+ FileWrite $1 'kleopatra=@ByteArray(it) $\r$\n'
+ Goto lang_done
+portugese:
+ FileWrite $1 'kleopatra=@ByteArray(pt) $\r$\n'
+ Goto lang_done
+portugese_br:
+ FileWrite $1 'kleopatra=@ByteArray(pt_BR) $\r$\n'
+ Goto lang_done
+simpchinese:
+ FileWrite $1 'kleopatra=@ByteArray(zh_CN) $\r$\n'
+ Goto lang_done
+tradchinese:
+ FileWrite $1 'kleopatra=@ByteArray(zh_TW) $\r$\n'
+ Goto lang_done
+lang_done:
FileClose $1
pop $1
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index feac820..48383d1 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -174,6 +174,7 @@ Section "-un.kleopatra"
RmDir "$INSTDIR\share\kservices5\"
Delete "$INSTDIR\share\kdeglobals"
+ Delete "$INSTDIR\share\klanguageoverridesrc"
Delete "$INSTDIR\share\QtProject\qtlogging.ini"
# Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg2.png"
# Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg.png"
commit b799151946d37844bac9fd636ddf52629e088067
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Feb 29 11:06:37 2016 +0100
Fix extra-cmake-modules section name.
* src/inst-extra-cmake-modules.nsi: Fix section name.
diff --git a/src/inst-extra-cmake-modules.nsi b/src/inst-extra-cmake-modules.nsi
index cee85c5..1c160be 100644
--- a/src/inst-extra-cmake-modules.nsi
+++ b/src/inst-extra-cmake-modules.nsi
@@ -21,9 +21,9 @@
!define prefix ${ipdir}/extra-cmake-modules-${gpg4win_pkg_extra_cmake_modules}
!ifdef DEBUG
-Section "extra_cmake_modules" SEC_extra_cmake_modules
+Section "extra_cmake_modules" SEC_extra-cmake-modules
!else
-Section "-extra_cmake_modules" SEC_extra_cmake_modules
+Section "-extra_cmake_modules" SEC_extra-cmake-modules
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
commit 8c6859b8c21d55c45ed4a2bb06e715afe24bb86a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Feb 29 11:05:58 2016 +0100
Disable light and vanilla installer by default
* configure.ac: Disable light and vanilla by default.
--
They might be dropped altogether in the future. For now just
disable them.
diff --git a/configure.ac b/configure.ac
index 351d556..5394cef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ AC_ARG_ENABLE(light-installer,
AC_HELP_STRING([--disable-light-installer],
[Do not create the light version of the installer]),
build_light_installer=$enableval,
- build_light_installer=yes)
+ build_light_installer=no)
AM_CONDITIONAL(BUILD_LIGHT_INSTALLER, test "$build_light_installer" = yes)
# You can build a vanilla version of the installer, featuring only
@@ -168,7 +168,7 @@ AC_ARG_ENABLE(vanilla-installer,
AC_HELP_STRING([--disable-vanilla-installer],
[Do not create the vanilla version of the installer]),
build_vanilla_installer=$enableval,
- build_vanilla_installer=yes)
+ build_vanilla_installer=no)
AM_CONDITIONAL(BUILD_VANILLA_INSTALLER, test "$build_vanilla_installer" = yes)
# If you want to build only the light or vanilla installer, you may
commit c39c6a78788cabba144ada1f0fe3f7ffca158857
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Feb 25 15:26:50 2016 +0100
Do not create uninstaller shortcut
* installer-finish.nsi: Do not create uninstaller shortcut.
--
Shortcuts to uninstallers are not something thats done nowadays.
You have the "Apps" or Software settings to uninstall software.
diff --git a/src/installer-finish.nsi b/src/installer-finish.nsi
index 86ec2d5..fce3868 100644
--- a/src/installer-finish.nsi
+++ b/src/installer-finish.nsi
@@ -23,20 +23,6 @@ Var MYTMP
Section
WriteUninstaller "$INSTDIR\${PACKAGE}-uninstall.exe"
-!ifdef HAVE_STARTMENU
- # Check if the start menu entries where requested.
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "installer-options.ini" \
- "Field 2" "State"
- IntCmp $R0 0 no_start_menu_uninstall
-
- # Create a shortcut named "new shortcut" in the start menu programs
- # directory point the new shortcut at the program uninstaller
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" \
- "$INSTDIR\${PACKAGE}-uninstall.exe" \
- "" "$INSTDIR\${PACKAGE}-uninstall.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_uninstall)
- no_start_menu_uninstall:
-!endif
-
# Windows Add/Remove Programs support
# Note that the version is appended to the DisplayName, despite that
# this is not necessary as a click on "support information" gives
commit 9b488ec6444fa5d9fdb3c6ae4e73b970354b8d81
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Feb 24 16:36:30 2016 +0100
Remove qt as a build dependency
* README: Remove qt as build dependency.
--
With qt5 we are building moc ourself.
diff --git a/README b/README
index 4b37c8a..91e90ec 100644
--- a/README
+++ b/README
@@ -59,7 +59,6 @@ to be installed:
texlive-latex-extra
texlive-lang-german
latex-xcolor (for the compendium)
- libqt4-dev-bin (in case pinentry-qt needs moc)
libgettextpo-dev
-----------------------------------------------------------------------
Summary of changes:
README | 1 -
configure.ac | 4 +-
src/inst-extra-cmake-modules.nsi | 4 +-
src/inst-kleopatra.nsi | 58 +++++++-
src/inst-sections.nsi | 294 +--------------------------------------
src/installer-finish.nsi | 114 +--------------
src/installer.nsi | 16 ---
src/uninst-kleopatra.nsi | 1 +
8 files changed, 62 insertions(+), 430 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list