[RELEASE] v5.1.1 release.

Add a auto-package script.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@352 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/bin/change.log

@@ -1,3 +1,14 @@
+Notepad++ v5.1.1 fixed bugs (from v5.1) :
+
+1.  Fix Unicode version display Korean/Japanese language problem.
+2.  Fix bug : Open in new instance not allowing spaces in paths.
+3.  Fix "Global Styles" string incorrectly displayed in Unicode version.
+4.  Fix filters for open/save dialog not showing or incorrectly (showing 'L').
+5.  Fix calltip argument with 'L' leader character bug.
+6.  Fix tab control draw bug. 
+
+
+
 Notepad++ v5.1 fixed bugs and added features (from v5.0.3) :
 
 1.  Make Notepad++ Unicode-compliant application(Unicode path supported).
@@ -41,11 +52,12 @@ Included plugins (Unicode):
 5.  FTP_synchronize v0.9.6
 6.  NppAutoIndent 1.2
 7.  NppDocShare v0.1
+8.  TexFX v0.24a
   
 Included plugins (ANSI):
 
 1.  TexFX v0.24a
-2.  NppExec v0.2 RC3.2
+2.  NppExec v0.25R2
 3.  Spell Checker v1.3.1
 4.  MIME Tools v1.5
 5.  FTP_synchronize v0.9.6

PowerEditor/bin/todo.txt

@@ -1,4 +0,0 @@
-TODO:
-
-1.  A generic code formatter (for C, C++ and HTML...). (can be done by plugin)
-2.  A smart indent (TAB) for C or/and for HTML. (can be done by plugin)

PowerEditor/installer/nppSetup.nsi

@@ -17,16 +17,16 @@
 
 ; Define the application name
 !define APPNAME "Notepad++"
-!define APPNAMEANDVERSION "Notepad++ v5.1"
+!define APPNAMEANDVERSION "Notepad++ v5.1.1"
 
 !define VERSION_MAJOR 5
-!define VERSION_MINOR 1
+!define VERSION_MINOR 11
 
 ; Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Notepad++"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\bin\npp.5.1.Installer.exe"
+OutFile "..\bin\npp.5.1.1.Installer.exe"
 
 ; GetWindowsVersion
  ;
@@ -204,6 +204,7 @@ FunctionEnd
   !insertmacro MUI_LANGUAGE "Albanian"
   !insertmacro MUI_LANGUAGE "Malay"
   !insertmacro MUI_LANGUAGE "Galician"
+  !insertmacro MUI_LANGUAGE "Basque"
   
   ;!insertmacro MUI_LANGUAGE "Latvian"
   ;!insertmacro MUI_LANGUAGE "Macedonian"
@@ -296,6 +297,8 @@ LangString langFileName ${LANG_BELARUSIAN} "belarusian.xml"
 LangString langFileName ${LANG_ALBANIAN} "albanian.xml"
 LangString langFileName ${LANG_MALAY} "malay.xml"
 LangString langFileName ${LANG_GALICIAN} "galician.xml"
+LangString langFileName ${LANG_BASQUE} "basque.xml"
+
 
 ;--------------------------------
 ;Variables
@@ -650,17 +653,10 @@ SubSectionEnd
 SubSection "Plugins" Plugins
 	
 	SetOverwrite on
-/*
+
 	Section "NPPTextFX" NPPTextFX
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\NPPTextFX.dll"
-		StrCmp $IS_LOCAL "1" 0 NOT_LOCAL
-			SetOutPath "$INSTDIR\plugins"
-			goto LOCAL
-	NOT_LOCAL:
-			SetOutPath "$APPDATA\Notepad++"
-	LOCAL:
-		;File "..\bin\plugins\NPPTextFX.ini"
 		
 		SetOutPath "$INSTDIR\plugins\NPPTextFX"
 		File "..\bin\plugins\NPPTextFX\AsciiToEBCDIC.bin"
@@ -671,7 +667,7 @@ SubSection "Plugins" Plugins
 		SetOutPath "$INSTDIR\plugins\doc"
 		File "..\bin\plugins\doc\NPPTextFXdemo.TXT"
 	SectionEnd
-*/
+
 
 	Section "NppDocShare" NppDocShare
 		Delete "$INSTDIR\plugins\NppDocShare.dll"

PowerEditor/installer/packageAll.bat

@@ -0,0 +1,42 @@
+cd ..\bin\
+
+del /F /S /Q .\zipped.package.release\unicode\*.*
+copy /Y license.txt .\zipped.package.release\unicode\
+copy /Y readme.txt .\zipped.package.release\unicode\
+copy /Y change.log .\zipped.package.release\unicode\
+copy /Y config.model.xml .\zipped.package.release\unicode\
+copy /Y langs.model.xml .\zipped.package.release\unicode\
+copy /Y stylers.model.xml .\zipped.package.release\unicode\
+copy /Y contextMenu.xml .\zipped.package.release\unicode\
+copy /Y shortcuts.xml .\zipped.package.release\unicode\
+copy /Y doLocalConf.xml .\zipped.package.release\unicode\
+copy /Y LINEDRAW.TTF .\zipped.package.release\unicode\
+copy /Y "notepad++.exe" .\zipped.package.release\unicode\
+copy /Y SciLexer.dll .\zipped.package.release\unicode\
+copy /Y ".\plugins\*.*" .\zipped.package.release\unicode\plugins\
+copy /Y ".\plugins\APIs\*.xml" .\zipped.package.release\unicode\plugins\APIs
+copy /Y ".\plugins\doc\*.*" .\zipped.package.release\unicode\plugins\doc
+copy /Y ".\plugins\NPPTextFX\*.*" .\zipped.package.release\unicode\plugins\NPPTextFX
+
+
+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\plugins\Config\*.*
+copy /Y license.txt .\zipped.package.release\ansi\
+copy /Y readme.txt .\zipped.package.release\ansi\
+copy /Y change.log .\zipped.package.release\ansi\
+copy /Y config.model.xml .\zipped.package.release\ansi\
+copy /Y langs.model.xml .\zipped.package.release\ansi\
+copy /Y stylers.model.xml .\zipped.package.release\ansi\
+copy /Y contextMenu.xml .\zipped.package.release\ansi\
+copy /Y shortcuts.xml .\zipped.package.release\ansi\
+copy /Y doLocalConf.xml .\zipped.package.release\ansi\
+copy /Y LINEDRAW.TTF .\zipped.package.release\ansi\
+
+"C:\Program Files\7-Zip\7z.exe" a -tzip -r npp.bin.zip .\zipped.package.release\*
+"C:\Program Files\NSIS\makensis.exe" ..\installer\nppSetup.nsi
+
+
+

PowerEditor/src/Notepad_plus.cpp

@@ -5214,7 +5214,6 @@ void Notepad_plus::changeMenuLang(generic_string & pluginsTrans, generic_string
 	}
 
 	TiXmlNode *menuCommandsRoot = mainMenu->FirstChild(TEXT("Commands"));
-
 	for (TiXmlNode *childNode = menuCommandsRoot->FirstChildElement(TEXT("Item"));
 		childNode ;
 		childNode = childNode->NextSibling(TEXT("Item")) )

PowerEditor/src/langs.model.xml

@@ -35,7 +35,7 @@
 			<Keywords name="instre1">alias ar asa awk banner basename bash bc bdiff break bunzip2 bzip2 cal calendar case cat cc cd chmod cksum clear cmp col comm compress continue cp cpio crypt csplit ctags cut date dc dd declare deroff dev df diff diff3 dircmp dirname do done du echo ed egrep elif else env esac eval ex exec exit expand export expr false fc fgrep fi file find fmt fold for function functions getconf getopt getopts grep gres hash head help history iconv id if in integer jobs join kill local lc let line ln logname look ls m4 mail mailx make man mkdir more mt mv newgrp nl nm nohup ntps od pack paste patch pathchk pax pcat perl pg pr print printf ps pwd read readonly red return rev rm rmdir sed select set sh shift size sleep sort spell split start stop strings strip stty sum suspend sync tail tar tee test then time times touch tr trap true tsort tty type typeset ulimit umask unalias uname uncompress unexpand uniq unpack unset until uudecode uuencode vi vim vpax wait wc whence which while who wpaste wstart xargs zcat</Keywords>
 		</Language>
 		<Language name="batch" ext="bat cmd nt" commentLine="REM">
-            <Keywords name="instre1">rem set if else exist errorlevel for in do break call chcp cd chdir choice cls country ctty date del erase dir echo exit goto loadfix loadhigh mkdir md move path pause prompt rename ren rmdir rd shift time type ver verify vol com con lpt nul defined not errorlevel cmdextversion</Keywords>
+            <Keywords name="instre1">rem set if else exist errorlevel for in do break call copy chcp cd chdir choice cls country ctty date del erase dir echo exit goto loadfix loadhigh mkdir md move path pause prompt rename ren rmdir rd shift time type ver verify vol com con lpt nul defined not errorlevel cmdextversion</Keywords>
         </Language>
 		<Language name="c"  ext="c" commentLine="//" commentStart="/*" commentEnd="*/">
             <Keywords name="instre1">if else switch case default break goto return for while do continue typedef sizeof NULL</Keywords>

PowerEditor/src/resource.h

@@ -18,9 +18,9 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.1")
-#define VERSION_VALUE TEXT("5.1\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
-#define VERSION_DIGITALVALUE 5, 1, 0, 0
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.1.1")
+#define VERSION_VALUE TEXT("5.11\0")  // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
+#define VERSION_DIGITALVALUE 5, 1, 1, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")