Notepad3 5.18.1003.1309 RC

xsak · Oct 7, 2018 · 5678162 · 5678162
1 parent 11f12d8
commit 5678162
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 26 deletions.
diff --git a/Build/Changes.txt b/Build/Changes.txt
@@ -12,7 +12,6 @@ LEGEND:
 
 ==================================================
 
-
 --------------------------------------------------
 Version 4.18.511.992 (12 May 2018)
 --------------------------------------------------

diff --git a/Build/Ignore.txt b/Build/Ignore.txt
@@ -0,0 +1 @@
+\obj\
diff --git a/Build/make_zip.bat b/Build/make_zip.bat
@@ -85,18 +85,21 @@ IF EXIST "%TEMP_NAME%" RD /S /Q "%TEMP_NAME%"
 IF NOT EXIST "%TEMP_NAME%" MD "%TEMP_NAME%"
 IF NOT EXIST "Packages" MD "Packages"
 
-FOR %%A IN ("..\%1\Notepad3.exe"^
- "Readme.txt" "Changes.txt" "License.txt"^
- "..\%1\minipath.exe" "..\%1\np3encrypt.exe" "
-) DO COPY /Y /V "%%A" "%TEMP_NAME%\"
+FOR %%A IN ("Changes.txt" "License.txt" "Readme.txt"^
+ "..\%1\ced.exe" "..\%1\Notepad3.exe" "..\%1\np3encrypt.exe"^
+ "..\%1\minipath.exe") DO COPY /Y /V "%%A" "%TEMP_NAME%\"
+
+SET "LNG=%TEMP_NAME%\lng"
+IF NOT EXIST %LNG% MD %LNG%
+XCOPY /E /Y /V "..\%1\lng" "%LNG%" /EXCLUDE:Ignore.txt
 
 SET "FAVORITES=%TEMP_NAME%\Favorites"
 IF NOT EXIST "%FAVORITES%" MD "%FAVORITES%"
 
 PUSHD "%TEMP_NAME%"
 "%SEVENZIP%" a -tzip -mx=9^
  "%ZIP_NAME%.zip" "License.txt" "Notepad3.exe" "Changes.txt"^
- "Readme.txt" "Favorites" "minipath.exe" "np3encrypt.exe">NUL
+ "Readme.txt" "Favorites" "minipath.exe" "np3encrypt.exe" "ced.exe" "lng">NUL
 IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"
 
 CALL :SUBMSG "INFO" "%ZIP_NAME%.zip created successfully!"

diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss
@@ -123,16 +123,59 @@ Name: remove_default; Description: {cm:tsk_RemoveDefault}; GroupDescript
 
 
 [Files]
-Source: {#bindir}\Release_x64_v141\Notepad3.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
-Source: {#bindir}\Release_x86_v141\Notepad3.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
-Source: License.txt; DestDir: {app}; Flags: ignoreversion
-Source: Readme.txt; DestDir: {app}; Flags: ignoreversion
-Source: Notepad3.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
-Source: {#bindir}\Release_x64_v141\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
-Source: {#bindir}\Release_x86_v141\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
-Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
-Source: {#bindir}\Release_x64_v141\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
-Source: {#bindir}\Release_x86_v141\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\Notepad3.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\Notepad3.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: License.txt; DestDir: {app}; Flags: ignoreversion
+Source: Readme.txt; DestDir: {app}; Flags: ignoreversion
+Source: Notepad3.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
+Source: {#bindir}\Release_x64_v141\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall
+Source: {#bindir}\Release_x64_v141\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\ced.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\ced.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\mplng.dll; DestDir: {app}\lng; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\mplng.dll; DestDir: {app}\lng; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\np3lng.dll; DestDir: {app}\lng; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\np3lng.dll; DestDir: {app}\lng; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\af-ZA\mplng.dll.mui; DestDir: {app}\lng\af-ZA; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\af-ZA\mplng.dll.mui; DestDir: {app}\lng\af-ZA; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\af-ZA\np3lng.dll.mui; DestDir: {app}\lng\af-ZA; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\af-ZA\np3lng.dll.mui; DestDir: {app}\lng\af-ZA; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\de-DE\mplng.dll.mui; DestDir: {app}\lng\de-DE; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\de-DE\mplng.dll.mui; DestDir: {app}\lng\de-DE; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\de-DE\np3lng.dll.mui; DestDir: {app}\lng\de-DE; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\de-DE\np3lng.dll.mui; DestDir: {app}\lng\de-DE; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\en-GB\mplng.dll.mui; DestDir: {app}\lng\en-GB; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\en-GB\mplng.dll.mui; DestDir: {app}\lng\en-GB; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\en-GB\np3lng.dll.mui; DestDir: {app}\lng\en-GB; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\en-GB\np3lng.dll.mui; DestDir: {app}\lng\en-GB; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\en-US\mplng.dll.mui; DestDir: {app}\lng\en-US; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\en-US\mplng.dll.mui; DestDir: {app}\lng\en-US; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\en-US\np3lng.dll.mui; DestDir: {app}\lng\en-US; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\en-US\np3lng.dll.mui; DestDir: {app}\lng\en-US; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\es-ES\mplng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\es-ES\mplng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\es-ES\np3lng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\es-ES\np3lng.dll.mui; DestDir: {app}\lng\es-ES; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\fr-FR\mplng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\fr-FR\mplng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\fr-FR\np3lng.dll.mui; DestDir: {app}\lng\fr-FR; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\ja-JP\mplng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\ja-JP\mplng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\ja-JP\np3lng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\ja-JP\np3lng.dll.mui; DestDir: {app}\lng\ja-JP; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\nl-NL\mplng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\nl-NL\mplng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\nl-NL\np3lng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\nl-NL\np3lng.dll.mui; DestDir: {app}\lng\nl-NL; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode()
+Source: {#bindir}\Release_x64_v141\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode()
+Source: {#bindir}\Release_x86_v141\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode()
+
 
 [Dirs]
 Name: "{userappdata}\Rizonesoft\Notepad3\Favorites"

diff --git a/Version.ps1 b/Version.ps1
@@ -33,7 +33,7 @@ function DebugOutput($msg)
 try 
 {
  $AppName = "Notepad3"
- $Major = 4
+ $Major = 5
  $Minor = [int]$(Get-Date -format yy)
  $Revis = [int]$(Get-Date -format MMdd)
  if ($AppVeyorEnv) {

diff --git a/Versions/build.txt b/Versions/build.txt
@@ -1 +1 @@
-1116
+1309
diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt
@@ -1 +1 @@
-TinyExpr
+RC
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
  <assemblyIdentity
  name="Notepad3"
  processorArchitecture="*"
- version="4.18.921.1116"
+ version="5.18.1003.1309"
  type="win32"
  />
- <description>Notepad3 TinyExpr</description>
+ <description>Notepad3 RC</description>
 </assembly>
diff --git a/src/VersionEx.h b/src/VersionEx.h
@@ -4,10 +4,10 @@
 // //
 // //////////////////////////////////////////////////////////
 #define APPNAME "Notepad3"
-#define VERSION_MAJOR 4
+#define VERSION_MAJOR 5
 #define VERSION_MINOR 18
-#define VERSION_REV 921
-#define VERSION_BUILD 1116
-#define SCINTILLA_VER 411
+#define VERSION_REV 1003
+#define VERSION_BUILD 1309
+#define SCINTILLA_VER 412
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH " TinyExpr"
+#define VERSION_PATCH " RC"