Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

[RELEASE] Notepad++ 5.7 release. [#45] Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>
npp-community · Oct 7, 2010 · 15ac679 · 15ac679
2 parents b3b70ff + 47f7dcf
commit 15ac679
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 19 deletions.
diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
@@ -21,8 +21,8 @@ Included plugins (Unicode):
 2.  Spell Checker v1.3.3
 3.  MIME Tools v1.6
 4.  NppExport v0.2.8
-5.  Compare Plugin 1.5.5
-6.  Plugin Manager 0.9.3.0
+5.  Compare Plugin 1.5.6
+6.  Plugin Manager 0.9.3.1
 7.  NppFTP 0.1.3.0
 8.  Select 'N' Launch 1.0
 
@@ -37,7 +37,5 @@ Included plugins (ANSI):
 6.  Light Explorer v1.6
 7.  Compare Plugin 1.5.5
 8.  Plugin Manager 0.9.3.0
-9.  NppFTP 0.1.3.0
-10. Select 'N' Launch 1.0
 
 
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
@@ -661,27 +661,33 @@ SubSection "Plugins" Plugins
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\mimeTools.dll"
 	SectionEnd
-/*
-	Section "FTP synchronize" FTP_synchronize
-		Delete "$INSTDIR\plugins\FTP_synchronizeA.dll"
+
+	Section "Npp FTP" NppFTP
+		Delete "$INSTDIR\plugins\NppFTP.dll"
 		SetOutPath "$INSTDIR\plugins"
-		File "..\bin\plugins\FTP_synchronize.dll"
-		SetOutPath "$INSTDIR\plugins\doc"
-		File "..\bin\plugins\doc\FTP_synchonize.ReadMe.txt"
+		File "..\bin\plugins\NppFTP.dll"
+		SetOutPath "$INSTDIR\plugins\doc\NppFTP"
+		File "..\bin\plugins\doc\NppFTP\license_NppFTP.txt"
+		File "..\bin\plugins\doc\NppFTP\license_libssh.txt"
+		File "..\bin\plugins\doc\NppFTP\license_OpenSSL.txt"
+		File "..\bin\plugins\doc\NppFTP\license_TiXML.txt"
+		File "..\bin\plugins\doc\NppFTP\license_ZLIB.txt"
+		File "..\bin\plugins\doc\NppFTP\license_UTCP.htm"
+		File "..\bin\plugins\doc\NppFTP\Readme.txt"
 	SectionEnd
-*/
+
 	Section "NppExport" NppExport
 		Delete "$INSTDIR\plugins\NppExport.dll"
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\NppExport.dll"
 	SectionEnd
-/*
-	Section "Change Markers" ChangeMarkers
-		Delete "$INSTDIR\plugins\NppPlugin_ChangeMarker.dll"
+
+	Section "Select 'N' Launch" SelectNLaunch
+		Delete "$INSTDIR\plugins\SelectNLaunch.dll"
 		SetOutPath "$INSTDIR\plugins"
-		File "..\bin\plugins\NppPlugin_ChangeMarker.dll"
+		File "..\bin\plugins\SelectNLaunch.dll"
 	SectionEnd
-*/
+
 	Section "Compare Plugin" ComparePlugin
 		Delete "$INSTDIR\plugins\ComparePlugin.dll"
 		SetOutPath "$INSTDIR\plugins"
@@ -979,11 +985,30 @@ SubSection un.Plugins
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
 
+	Section un.NppFTP
+		Delete "$INSTDIR\plugins\NppFTP.dll"
+
+		Delete "$INSTDIR\plugins\doc\NppFTP\license_NppFTP.txt"
+		Delete "$INSTDIR\plugins\doc\NppFTP\license_libssh.txt"
+		Delete "$INSTDIR\plugins\doc\NppFTP\license_OpenSSL.txt"
+		Delete "$INSTDIR\plugins\doc\NppFTP\license_TiXML.txt"
+		Delete "$INSTDIR\plugins\doc\NppFTP\license_ZLIB.txt"
+		Delete "$INSTDIR\plugins\doc\NppFTP\license_UTCP.htm"
+		Delete "$INSTDIR\plugins\doc\NppFTP\Readme.txt"
+
+		RMDir "$INSTDIR\plugins\"
+	SectionEnd
+
 	Section un.NppExport
 		Delete "$INSTDIR\plugins\NppExport.dll"
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
 
+	Section un.SelectNLaunch
+		Delete "$INSTDIR\plugins\SelectNLaunch.dll"
+		RMDir "$INSTDIR\plugins\"
+	SectionEnd
+
 	Section un.DocMonitor
 		Delete "$INSTDIR\plugins\docMonitor.dll"
 		Delete "$INSTDIR\plugins\Config\docMonitor.ini"

diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
@@ -47,7 +47,7 @@ copy /Y ..\bin\SciLexer.dll .\zipped.package.release\unicode\
 If ErrorLevel 1 PAUSE
 copy /Y "..\bin\plugins\*.*" .\zipped.package.release\unicode\plugins\
 If ErrorLevel 1 PAUSE
-copy /Y "..\bin\plugins\doc\*.*" .\zipped.package.release\unicode\plugins\doc\
+xcopy /Y /E /S "..\bin\plugins\doc" .\zipped.package.release\unicode\plugins\doc
 If ErrorLevel 1 PAUSE
 copy /Y "..\bin\plugins\Config\tidy\*.*" .\zipped.package.release\unicode\plugins\Config\tidy\
 If ErrorLevel 1 PAUSE
@@ -114,11 +114,11 @@ for %%a in (npp.*.Installer.exe) do (
   set nppInstallerVar=%%a
   set zipvar=!nppInstallerVar:Installer.exe=bin.zip!
   set 7zvar=!nppInstallerVar:Installer.exe=bin.7z!
-  set md5var=!nppInstallerVar:Installer.exe=release.md5!
+  rem set md5var=!nppInstallerVar:Installer.exe=release.md5!
 )
 ren npp.bin.zip !zipvar!
 ren npp.bin.7z !7zvar!
-..\externalTools\md5.exe -o!md5var! !nppInstallerVar! !zipvar! !7zvar!
+rem ..\externalTools\md5.exe -o!md5var! !nppInstallerVar! !zipvar! !7zvar!
 
 cd ..