From 048e578942e72b7d5d00b3e6117bc35ff72fadb1 Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 11 Apr 2012 06:48:25 +0000 Subject: updated NSIS scripts. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3037 ee746299-78ed-0310-b773-934348b2243d --- nsis/english.nsh | 2 ++ nsis/japanese.nsh | 2 ++ nsis/sylpheed-defs.nsh | 2 +- nsis/sylpheed.nsi | 21 ++++++++++++++++++++- 4 files changed, 25 insertions(+), 2 deletions(-) (limited to 'nsis') diff --git a/nsis/english.nsh b/nsis/english.nsh index a212dec5..de87cf29 100644 --- a/nsis/english.nsh +++ b/nsis/english.nsh @@ -10,6 +10,7 @@ LangString sylpheed_description ${LANG_ENGLISH} "Sylpheed itself" LangString plugins_description ${LANG_ENGLISH} "Plug-ins for Sylpheed" LangString sylpheed_pro_description ${LANG_ENGLISH} "Sylpheed Pro Full-text Search Plug-in" LangString attachment_tool_plugin_description ${LANG_ENGLISH} "attachment_tool plugin" +LangString sylfilter_description ${LANG_ENGLISH} "SylFilter bayesian spam filter" LangString bsfilter_description ${LANG_ENGLISH} "bsfilter bayesian spam filter" LangString desktop_shortcut_description ${LANG_ENGLISH} "Create shortcut for Desktop (current user only)" LangString quick_shortcut_description ${LANG_ENGLISH} "Create shortcut for Quick Launch (current user only)" @@ -19,6 +20,7 @@ LangString un_sylpheed_description ${LANG_ENGLISH} "Sylpheed itself" LangString un_plugins_description ${LANG_ENGLISH} "Plug-ins for Sylpheed" LangString un_sylpheed_pro_description ${LANG_ENGLISH} "Sylpheed Pro Full-text Search Plug-in" LangString un_attachment_tool_plugin_description ${LANG_ENGLISH} "attachment_tool plugin" +LangString un_sylfilter_description ${LANG_ENGLISH} "SylFilter bayesian spam filter" LangString un_bsfilter_description ${LANG_ENGLISH} "bsfilter bayesian spam filter" LangString un_desktop_shortcut_description ${LANG_ENGLISH} "Delete shortcut for Desktop (current user only)" LangString un_quick_shortcut_description ${LANG_ENGLISH} "Delete shortcut for Quick Launch (current user only)" diff --git a/nsis/japanese.nsh b/nsis/japanese.nsh index 309b05d8..d86c534c 100644 --- a/nsis/japanese.nsh +++ b/nsis/japanese.nsh @@ -10,6 +10,7 @@ LangString sylpheed_description ${LANG_JAPANESE} "Sylpheed LangString plugins_description ${LANG_JAPANESE} "Sylpheed用のプラグイン" LangString sylpheed_pro_description ${LANG_JAPANESE} "Sylpheed Pro 全文検索プラグイン" LangString attachment_tool_plugin_description ${LANG_JAPANESE} "attachment_tool プラグイン" +LangString sylfilter_description ${LANG_JAPANESE} "SylFilter 迷惑メールフィルタ" LangString bsfilter_description ${LANG_JAPANESE} "bsfilter 迷惑メールフィルタ" LangString desktop_shortcut_description ${LANG_JAPANESE} "デスクトップにショートカットを作成します(現在のユーザのみ)" LangString quick_shortcut_description ${LANG_JAPANESE} "クイック起動にショートカットを作成します(現在のユーザのみ)" @@ -19,6 +20,7 @@ LangString un_sylpheed_description ${LANG_JAPANESE} "Sylpheed LangString un_plugins_description ${LANG_JAPANESE} "Sylpheed用のプラグイン" LangString un_sylpheed_pro_description ${LANG_JAPANESE} "Sylpheed Pro 全文検索プラグイン" LangString un_attachment_tool_plugin_description ${LANG_JAPANESE} "attachment_tool プラグイン" +LangString un_sylfilter_description ${LANG_JAPANESE} "SylFilter 迷惑メールフィルタ" LangString un_bsfilter_description ${LANG_JAPANESE} "bsfilter 迷惑メールフィルタ" LangString un_desktop_shortcut_description ${LANG_JAPANESE} "デスクトップのショートカットを削除します(現在のユーザのみ)" LangString un_quick_shortcut_description ${LANG_JAPANESE} "クイック起動のショートカットを削除します(現在のユーザのみ)" diff --git a/nsis/sylpheed-defs.nsh b/nsis/sylpheed-defs.nsh index 17fb9a11..684d5412 100644 --- a/nsis/sylpheed-defs.nsh +++ b/nsis/sylpheed-defs.nsh @@ -1,7 +1,7 @@ ;!define SYLPHEED_PRO !define PRODUCT_NAME "Sylpheed" -!define PRODUCT_VERSION "3.2beta6" +!define PRODUCT_VERSION "3.2beta7" !ifdef SYLPHEED_PRO !define PRODUCT_PUBLISHER "SRA OSS, Inc. Japan" diff --git a/nsis/sylpheed.nsi b/nsis/sylpheed.nsi index 2730cf98..df9da347 100644 --- a/nsis/sylpheed.nsi +++ b/nsis/sylpheed.nsi @@ -129,6 +129,11 @@ ${MementoSectionEnd} SectionGroupEnd +${MementoSection} "sylfilter" sec_sylfilter + SetOutPath "$INSTDIR" + File /r "sylfilter\" +${MementoSectionEnd} + ${MementoSection} "bsfilter" sec_bsfilter SetOutPath "$INSTDIR" File /r "bsfilter\" @@ -274,6 +279,12 @@ SectionEnd SectionGroupEnd +Section "un.sylfilter" sec_un_sylfilter + ; sylfilter components + Delete "$INSTDIR\sylfilter.exe" + Delete "$INSTDIR\sylfilter-cui.exe" +SectionEnd + Section "un.bsfilter" sec_un_bsfilter ; bsfilter components Delete "$INSTDIR\bsfilter" @@ -314,6 +325,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${sec_sylpheed_pro} "$(sylpheed_pro_description)" !endif !insertmacro MUI_DESCRIPTION_TEXT ${sec_attachment_tool_plugin} "$(attachment_tool_plugin_description)" + !insertmacro MUI_DESCRIPTION_TEXT ${sec_sylfilter} "$(sylfilter_description)" !insertmacro MUI_DESCRIPTION_TEXT ${sec_bsfilter} "$(bsfilter_description)" !insertmacro MUI_DESCRIPTION_TEXT ${sec_desktop_shortcut} "$(desktop_shortcut_description)" !insertmacro MUI_DESCRIPTION_TEXT ${sec_quick_shortcut} "$(quick_shortcut_description)" @@ -326,6 +338,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${sec_un_sylpheed_pro} "$(un_sylpheed_pro_description)" !endif !insertmacro MUI_DESCRIPTION_TEXT ${sec_un_attachment_tool_plugin} "$(un_attachment_tool_plugin_description)" + !insertmacro MUI_DESCRIPTION_TEXT ${sec_un_sylfilter} "$(un_sylfilter_description)" !insertmacro MUI_DESCRIPTION_TEXT ${sec_un_bsfilter} "$(un_bsfilter_description)" !insertmacro MUI_DESCRIPTION_TEXT ${sec_un_desktop_shortcut} "$(un_desktop_shortcut_description)" !insertmacro MUI_DESCRIPTION_TEXT ${sec_un_quick_shortcut} "$(un_quick_shortcut_description)" @@ -364,8 +377,9 @@ uninst: StrCpy $ISSILENT "" ExecWait '$R0 $ISSILENT _?=$INSTDIR' ;Do not copy the uninstaller to a temp file - IfErrors no_remove_uninstaller + IfErrors no_remove_uninstaller done_ no_remove_uninstaller: + Abort ; label "done" used in MementoSectionRestore done_: @@ -412,6 +426,11 @@ check_app_running: !insertmacro SetSectionFlag ${sec_un_attachment_tool_plugin} ${SF_RO} attachment_tool_plugin_file_exists: + IfFileExists "$INSTDIR\sylfilter.exe" sylfilter_file_exists + !insertmacro UnselectSection ${sec_un_sylfilter} + !insertmacro SetSectionFlag ${sec_un_sylfilter} ${SF_RO} + sylfilter_file_exists: + IfFileExists "$INSTDIR\bsfilter" bsfilter_file_exists !insertmacro UnselectSection ${sec_un_bsfilter} !insertmacro SetSectionFlag ${sec_un_bsfilter} ${SF_RO} -- cgit v1.2.3