From c033d58cb8791b8aa5f4e38a00059f9c0b76b553 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Fri, 8 May 2015 19:39:51 +0200 Subject: [PATCH] [UPDATE] Remove outdated user manual from release package. --- PowerEditor/bin/readme.txt | 12 ++++++------ PowerEditor/installer/nppSetup.nsi | 20 +++++--------------- PowerEditor/installer/packageAll.bat | 4 ---- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/PowerEditor/bin/readme.txt b/PowerEditor/bin/readme.txt index a0c680e6d..5b3f34c73 100644 --- a/PowerEditor/bin/readme.txt +++ b/PowerEditor/bin/readme.txt @@ -13,9 +13,9 @@ The company I worked for used JEXT (another open source code editor in Java) as How to install: *************** -From the installer : +From the installer: Just follow the install wizard. -From the zip : +From the zip/7z package: just unzip all the files into a directory you want then launch it. @@ -23,13 +23,13 @@ Web sites: *********** Notepad++ official site: - http://notepad-plus-plus.org/ + https://notepad-plus-plus.org/ Notepad++ project site: - http://sourceforge.net/projects/notepad-plus/ + https://github.com/donho/notepad-plus-plus/ Notepad++ wiki: - http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Main_Page + http://docs.notepad-plus-plus.org/ Notepad++ support: http://sourceforge.net/projects/notepad-plus/forums @@ -39,4 +39,4 @@ Author: ******* Don Ho - http://notepad-plus-plus.org/contributors/author.html + https://notepad-plus-plus.org/contributors/author.html diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 8256ae494..932c207ff 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -179,7 +179,7 @@ FunctionEnd !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "..\license.txt" +!insertmacro MUI_PAGE_LICENSE "..\..\LICENSE" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_COMPONENTS page Custom ExtraOptions @@ -492,7 +492,7 @@ Section -"Notepad++" mainSection ; Set Section Files and Shortcuts SetOverwrite on - File "..\license.txt" + File "..\..\LICENSE" File "..\bin\SciLexer.dll" File "..\bin\change.log" File "..\bin\notepad++.exe" @@ -1218,6 +1218,7 @@ ${MementoSection} "Auto-Updater" AutoUpdater File "..\bin\updater\readme.txt" ${MementoSectionEnd} +/* ${MementoSection} "User Manual" UserManual SetOverwrite on IfFileExists "$INSTDIR\NppHelp.chm" 0 +2 @@ -1225,17 +1226,6 @@ ${MementoSection} "User Manual" UserManual SetOutPath "$INSTDIR\user.manual" File /r "..\bin\user.manual\" ${MementoSectionEnd} - -/* -Section /o "Create Shortcut on Desktop" - - -SectionEnd - - -Section /o "Use the old application icon" getOldIcon - -SectionEnd */ ${MementoSectionDone} @@ -1254,7 +1244,7 @@ ${MementoSectionDone} !insertmacro MUI_DESCRIPTION_TEXT ${Themes} 'The eye-candy to change visual effects. Use Theme selector to switch among them.' !insertmacro MUI_DESCRIPTION_TEXT ${htmlViewer} 'Open the html file in Notepad++ while you choose from IE.' !insertmacro MUI_DESCRIPTION_TEXT ${AutoUpdater} 'Keep your Notepad++ update: Check this option to install an update module which searches Notepad++ update on Internet and install it for you.' - !insertmacro MUI_DESCRIPTION_TEXT ${UserManual} 'Here you can get all the secrets of Notepad++.' + ;!insertmacro MUI_DESCRIPTION_TEXT ${UserManual} 'Here you can get all the secrets of Notepad++.' ;!insertmacro MUI_DESCRIPTION_TEXT ${shortcutOnDesktop} 'Check this option to add Notepad++ shortcut on your desktop.' ;!insertmacro MUI_DESCRIPTION_TEXT ${getOldIcon} "I won't blame you if you want to get the old icon back." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -1941,7 +1931,7 @@ Section Uninstall Delete "$INSTDIR\LINEDRAW.TTF" Delete "$INSTDIR\SciLexer.dll" Delete "$INSTDIR\change.log" - Delete "$INSTDIR\license.txt" + Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\notepad++.exe" Delete "$INSTDIR\readme.txt" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 9880c6e6a..c54a7dba3 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -122,10 +122,6 @@ If ErrorLevel 1 PAUSE copy /Y "..\bin\updater\gpup.exe" .\zipped.package.release\updater\ If ErrorLevel 1 PAUSE -rem document -xcopy /Y /S ..\bin\user.manual\*.* .\zipped.package.release\user.manual\ -If ErrorLevel 1 PAUSE - rem localizations copy /Y ".\nativeLang\*.xml" .\zipped.package.release\localization\