From f25921d05355cdf1a3779db786ec80fc357b7ebb Mon Sep 17 00:00:00 2001
From: Pairi Daiza <hpwamr@outlook.com>
Date: Mon, 27 Apr 2020 11:13:09 +0200
Subject: [PATCH] + chg: Notepad3Portable - automatic creation of  "7-Zip" file
 (2nd stage) + upd: version files

---
 Versions/day.txt                        | 2 +-
 np3portableapp/build_np3portableapp.cmd | 9 +++++++--
 res/Notepad3.exe.manifest.conf          | 2 +-
 src/VersionEx.h                         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Versions/day.txt b/Versions/day.txt
index 5e4a5228a..d2a1e59f6 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-425
+427
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index df6f6f864..8eaeecf97 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -198,11 +198,16 @@ del /F "%NP3_PORTAPP_INFO%_tmp.ini"
 :: - build Installer -
 "%PORTAPP_INSTALLER_CREATOR%" "%NP3_PORTAPP_DIR%"
 
-:: Signing "Notepad3Portable_x.xx.xxx.x.paf.exe" (".paf.exe" file is created by "Installer")
+:: Signing "Notepad3Portable_x.xx.xxx.x_yyyy.paf.exe" (".paf.exe" file is created by "Installer")
 :: call %SCRIPT_DIR%Signing_for_EXE_NP3_2nd.cmd
 
 :: Creation of a "7-Zip" file by appending the extension ".7z"
-copy /B %SCRIPT_DIR%Notepad3Portable_*.paf.exe %SCRIPT_DIR%Notepad3Portable_*.paf.exe.7z /Y /V
+set Notepad3Portable.paf.exe=%SCRIPT_DIR%Notepad3Portable_%VERSION%_%DEVNAME%.paf.exe
+if exist %Notepad3Portable.paf.exe% (
+    copy /B %Notepad3Portable.paf.exe% %Notepad3Portable.paf.exe%.7z /Y /V
+) else (
+    echo. "Notepad3Portable_x.xx.xxx.x_yyyy.paf.exe" does not exist
+)
 
 :: rename
 ::echo rename "%SCRIPT_DIR%Notepad3Portable_%VERSION%.paf.exe" "Notepad3Portable_%VERSION%_%DEVNAME%.paf.exe"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index d3fa9e26e..724c9b305 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.425.1"
+    version="5.20.427.1"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index f75d5f0e5..69dcd2516 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 425
+#define VERSION_REV 427
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.5