From 1b68569f53b9b52047b2bd0fee90188b9feefc25 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 29 May 2011 09:00:16 +0000 Subject: [PATCH] [ENHANCE] Enhance the packaging procedure. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@763 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nppSetup.nsi | 50 ++++++++++++++----- PowerEditor/installer/packageAll.bat | 7 +-- .../ansi/plugins/APIs/placeholder | 0 .../ansi/plugins/Config/placeholder | 0 .../ansi/plugins/doc/placeholder | 0 .../ansi/themes/placeholder | 0 .../ansi/updater/placeholder | 0 .../unicode/localization/placeholder | 0 .../unicode/plugins/APIs/placeholder | 0 .../unicode/plugins/Config/placeholder | 0 .../unicode/plugins/doc/placeholder | 0 .../unicode/themes/placeholder | 0 .../unicode/updater/placeholder | 0 PowerEditor/src/resource.h | 6 +-- PowerEditor/visual.net/notepadPlus.vcproj | 2 +- 15 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 PowerEditor/installer/zipped.package.release/ansi/plugins/APIs/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/ansi/plugins/Config/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/ansi/plugins/doc/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/ansi/themes/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/ansi/updater/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/unicode/localization/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/unicode/plugins/APIs/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/unicode/plugins/Config/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/unicode/plugins/doc/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/unicode/themes/placeholder create mode 100644 PowerEditor/installer/zipped.package.release/unicode/updater/placeholder diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 2fdb6bd34..22667ceeb 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -18,10 +18,10 @@ ; Define the application name !define APPNAME "Notepad++" -!define APPVERSION "5.9" -!define APPNAMEANDVERSION "Notepad++ v5.9" +!define APPVERSION "5.91" +!define APPNAMEANDVERSION "Notepad++ v5.91" !define VERSION_MAJOR 5 -!define VERSION_MINOR 87 +!define VERSION_MINOR 91 !define APPWEBSITE "http://notepad-plus-plus.org/" @@ -29,7 +29,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile ".\build\npp.5.9.Installer.exe" +OutFile ".\build\npp.5.9.1.Installer.exe" ; GetWindowsVersion ; @@ -132,6 +132,7 @@ FunctionEnd ; Modern interface settings !include "MUI.nsh" !include "x64.nsh" +!include "nsDialogs.nsh" !define MUI_ICON ".\images\npp_inst.ico" @@ -149,6 +150,7 @@ FunctionEnd !insertmacro MUI_PAGE_LICENSE "..\license.txt" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_COMPONENTS +;page Custom ChooserIcon !insertmacro MUI_PAGE_INSTFILES @@ -232,15 +234,15 @@ Function .onInit Pop $R0 StrCmp $R0 "95" 0 +3 - MessageBox MB_OK "The installer contains only Unicode version of Notepad++, which is not compatible with your Windows 95.$\nPlease use ANSI version in zipped package, which you can download here :$\nhttps://sourceforge.net/project/showfiles.php?group_id=95717&package_id=102072" + MessageBox MB_OK "This version of Notepad++ does not support your OS.$\nPlease download zipped package of version 5.9 and use ANSI version. You can find v5.9 here:$\nhttp://notepad-plus-plus.org/release/5.9" Abort StrCmp $R0 "98" 0 +3 - MessageBox MB_OK "The installer contains only Unicode version of Notepad++, which is not compatible with your Windows 98.$\nPlease use ANSI version in zipped package, which you can download here :$\nhttps://sourceforge.net/project/showfiles.php?group_id=95717&package_id=102072" + MessageBox MB_OK "This version of Notepad++ does not support your OS.$\nPlease download zipped package of version 5.9 and use ANSI version. You can find v5.9 here:$\nhttp://notepad-plus-plus.org/release/5.9" Abort StrCmp $R0 "ME" 0 +3 - MessageBox MB_OK "The installer contains only Unicode version of Notepad++, which is not compatible with your Windows ME.$\nPlease use ANSI version in zipped package, which you can download here :$\nhttps://sourceforge.net/project/showfiles.php?group_id=95717&package_id=102072" + MessageBox MB_OK "This version of Notepad++ does not support your OS.$\nPlease download zipped package of version 5.9 and use ANSI version. You can find v5.9 here:$\nhttp://notepad-plus-plus.org/release/5.9" Abort !insertmacro MUI_LANGDLL_DISPLAY @@ -257,6 +259,12 @@ Function .onInit FunctionEnd +/* +Function ChooserIcon + +FunctionEnd +*/ + LangString langFileName ${LANG_ENGLISH} "english.xml" LangString langFileName ${LANG_FRENCH} "french.xml" LangString langFileName ${LANG_TRADCHINESE} "chinese.xml" @@ -447,26 +455,44 @@ GLOBAL_INST: Delete "$INSTDIR\plugins\NPPTextFX.ini" IfFileExists "$INSTDIR\plugins\NppAutoIndent.dll" 0 +4 - MessageBox MB_OK "Due to the stabilty issue,$\nNppAutoIndent.dll will be moved to the directory $\"disabled$\"" /SD IDOK + MessageBox MB_OK "Due to the stability issue,$\nNppAutoIndent.dll will be moved to the directory $\"disabled$\"" /SD IDOK Rename "$INSTDIR\plugins\NppAutoIndent.dll" "$INSTDIR\plugins\disabled\NppAutoIndent.dll" Delete "$INSTDIR\plugins\NppAutoIndent.dll" IfFileExists "$INSTDIR\plugins\FTP_synchronize.dll" 0 +4 - MessageBox MB_OK "Due to the stabilty issue,$\nFTP_synchronize.dll will be moved to the directory $\"disabled$\"" /SD IDOK + MessageBox MB_OK "Due to the stability issue,$\nFTP_synchronize.dll will be moved to the directory $\"disabled$\"" /SD IDOK Rename "$INSTDIR\plugins\FTP_synchronize.dll" "$INSTDIR\plugins\disabled\FTP_synchronize.dll" Delete "$INSTDIR\plugins\FTP_synchronize.dll" IfFileExists "$INSTDIR\plugins\NppPlugin_ChangeMarker.dll" 0 +4 - MessageBox MB_OK "Due to the stabilty issue,$\nNppPlugin_ChangeMarker.dll will be moved to the directory $\"disabled$\"" /SD IDOK + MessageBox MB_OK "Due to the stability issue,$\nNppPlugin_ChangeMarker.dll will be moved to the directory $\"disabled$\"" /SD IDOK Rename "$INSTDIR\plugins\NppPlugin_ChangeMarker.dll" "$INSTDIR\plugins\disabled\NppPlugin_ChangeMarker.dll" Delete "$INSTDIR\plugins\NppPlugin_ChangeMarker.dll" IfFileExists "$INSTDIR\plugins\QuickText.UNI.dll" 0 +4 - MessageBox MB_OK "Due to the stabilty issue,$\n\QuickText.UNI.dll will be moved to the directory $\"disabled$\"" /SD IDOK + MessageBox MB_OK "Due to the stability issue,$\n\QuickText.UNI.dll will be moved to the directory $\"disabled$\"" /SD IDOK Rename "$INSTDIR\plugins\QuickText.UNI.dll" "$INSTDIR\plugins\disabled\QuickText.UNI.dll" Delete "$INSTDIR\plugins\QuickText.UNI.dll" - + IfFileExists "$INSTDIR\plugins\AHKExternalLexer.dll" 0 +4 + MessageBox MB_OK "Due to the compability issue,$\n\AHKExternalLexer.dll will be moved to the directory $\"disabled$\"" /SD IDOK + Rename "$INSTDIR\plugins\AHKExternalLexer.dll" "$INSTDIR\plugins\disabled\AHKExternalLexer.dll" + Delete "$INSTDIR\plugins\AHKExternalLexer.dll" + + IfFileExists "$INSTDIR\plugins\NppExternalLexers.dll" 0 +4 + MessageBox MB_OK "Due to the compability issue,$\n\NppExternalLexers.dll will be moved to the directory $\"disabled$\"" /SD IDOK + Rename "$INSTDIR\plugins\NppExternalLexers.dll" "$INSTDIR\plugins\disabled\NppExternalLexers.dll" + Delete "$INSTDIR\plugins\NppExternalLexers.dll" + + IfFileExists "$INSTDIR\plugins\ExternalLexerKVS.dll" 0 +4 + MessageBox MB_OK "Due to the compability issue,$\n\ExternalLexerKVS.dll will be moved to the directory $\"disabled$\"" /SD IDOK + Rename "$INSTDIR\plugins\ExternalLexerKVS.dll" "$INSTDIR\plugins\disabled\ExternalLexerKVS.dll" + Delete "$INSTDIR\plugins\ExternalLexerKVS.dll" + + IfFileExists "$INSTDIR\plugins\Oberon2LexerU.dll" 0 +4 + MessageBox MB_OK "Due to the compability issue,$\n\Oberon2LexerU.dll will be moved to the directory $\"disabled$\"" /SD IDOK + Rename "$INSTDIR\plugins\Oberon2LexerU.dll" "$INSTDIR\plugins\disabled\Oberon2LexerU.dll" + Delete "$INSTDIR\plugins\Oberon2LexerU.dll" ; Context Menu Management : removing old version of Context Menu module diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 6b077af8d..51be1af95 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -109,11 +109,8 @@ If ErrorLevel 1 PAUSE rem Notepad++ ANSI package -del /F /S /Q .\zipped.package.release\ansi\npp.pdb -del /F /S /Q .\zipped.package.release\ansi\config.xml -del /F /S /Q .\zipped.package.release\ansi\langs.xml -del /F /S /Q .\zipped.package.release\ansi\stylers.xml -del /F /S /Q .\zipped.package.release\ansi\session.xml +del /F /S /Q .\zipped.package.release\ansi\*.* + copy /Y ..\bin\SciLexer.dll .\zipped.package.release\ansi\ If ErrorLevel 1 PAUSE copy /Y ..\bin\license.txt .\zipped.package.release\ansi\ diff --git a/PowerEditor/installer/zipped.package.release/ansi/plugins/APIs/placeholder b/PowerEditor/installer/zipped.package.release/ansi/plugins/APIs/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/ansi/plugins/Config/placeholder b/PowerEditor/installer/zipped.package.release/ansi/plugins/Config/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/ansi/plugins/doc/placeholder b/PowerEditor/installer/zipped.package.release/ansi/plugins/doc/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/ansi/themes/placeholder b/PowerEditor/installer/zipped.package.release/ansi/themes/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/ansi/updater/placeholder b/PowerEditor/installer/zipped.package.release/ansi/updater/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/unicode/localization/placeholder b/PowerEditor/installer/zipped.package.release/unicode/localization/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/unicode/plugins/APIs/placeholder b/PowerEditor/installer/zipped.package.release/unicode/plugins/APIs/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/unicode/plugins/Config/placeholder b/PowerEditor/installer/zipped.package.release/unicode/plugins/Config/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/unicode/plugins/doc/placeholder b/PowerEditor/installer/zipped.package.release/unicode/plugins/doc/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/unicode/themes/placeholder b/PowerEditor/installer/zipped.package.release/unicode/themes/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/installer/zipped.package.release/unicode/updater/placeholder b/PowerEditor/installer/zipped.package.release/unicode/updater/placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index d43309b6a..3038bdeed 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -18,12 +18,12 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.9.1") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 // ex : #define VERSION_VALUE TEXT("5.63\0") -#define VERSION_VALUE TEXT("5.9\0") -#define VERSION_DIGITALVALUE 5, 9, 0, 0 +#define VERSION_VALUE TEXT("5.91\0") +#define VERSION_DIGITALVALUE 5, 9, 1, 0 #ifdef UNICODE #define UNICODE_ANSI_MODE TEXT("(UNICODE)") diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index 2a5f591f8..466adb0be 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -296,7 +296,7 @@