From 968f426fd8b454e9a1efe2bfcf0d80437949a227 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Fri, 26 Jul 2019 21:42:28 +0200 Subject: [PATCH] RC Release Changes --- Build/notepad3_setup.iss | 8 -------- Build/notepad3_x86_setup.iss | 16 ---------------- Versions/build.txt | 2 +- np3portableapp/_buildname.txt | 2 +- res/Notepad3.exe.manifest.conf | 20 ++++++++++---------- src/VersionEx.h | 28 ++++++++++++++-------------- 6 files changed, 26 insertions(+), 50 deletions(-) diff --git a/Build/notepad3_setup.iss b/Build/notepad3_setup.iss index 952e269bc..191a63e96 100644 --- a/Build/notepad3_setup.iss +++ b/Build/notepad3_setup.iss @@ -20,10 +20,6 @@ #error Compile MiniPath x86 first #endif -#ifnexist bindir + "\Release_x86_v142\np3encrypt.exe" - #error Compile np3encrypt.exe x86 first -#endif - #ifnexist bindir + "\Release_x64_v142\Notepad3.exe" #error Compile Notepad3 x64 first #endif @@ -32,10 +28,6 @@ #error Compile MiniPath x64 first #endif -#ifnexist bindir + "\Release_x64_v142\np3encrypt.exe" - #error Compile np3encrypt.exe x64 first -#endif - #define app_version GetFileVersion(bindir + "\Release_x86_v142\Notepad3.exe") #define app_name "Notepad3" #define app_copyright "(c) Rizonesoft 2008-2019" diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss index f015847d8..d43a6c46e 100644 --- a/Build/notepad3_x86_setup.iss +++ b/Build/notepad3_x86_setup.iss @@ -20,22 +20,6 @@ #error Compile MiniPath x86 first #endif -#ifnexist bindir + "\Release_x86_v142\np3encrypt.exe" - #error Compile np3encrypt.exe x86 first -#endif - -#ifnexist bindir + "\Release_x64_v142\Notepad3.exe" - #error Compile Notepad3 x64 first -#endif - -#ifnexist bindir + "\Release_x64_v142\minipath.exe" - #error Compile MiniPath x64 first -#endif - -#ifnexist bindir + "\Release_x64_v142\np3encrypt.exe" - #error Compile np3encrypt.exe x64 first -#endif - #define app_version GetFileVersion(bindir + "\Release_x86_v142\Notepad3.exe") #define app_name "Notepad3" #define app_copyright "(c) Rizonesoft 2008-2019" diff --git a/Versions/build.txt b/Versions/build.txt index 0af28381a..5bf0455ae 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2407 +2515 diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index 900e00b33..463000ad2 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -BETA +"RC" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 399ea693c..312b87d04 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -1,10 +1,10 @@ - - - - Notepad3 BETA - + + + + Notepad3 RC + diff --git a/src/VersionEx.h b/src/VersionEx.h index b10be1159..8ebb9c9b2 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,14 +1,14 @@ -// ////////////////////////////////////////////////////////// -// // -// this file is generated - use template to apply changes // -// // -// ////////////////////////////////////////////////////////// -#define APPNAME Notepad3 -#define SAPPNAME "Notepad3" -#define VERSION_MAJOR 5 -#define VERSION_MINOR 19 -#define VERSION_REV 726 -#define VERSION_BUILD 2407 -#define SCINTILLA_VER 420 -#define ONIGURUMA_REGEX_VER 6.9.3 -#define VERSION_PATCH BETA +// ////////////////////////////////////////////////////////// +// // +// this file is generated - use template to apply changes // +// // +// ////////////////////////////////////////////////////////// +#define APPNAME Notepad3 +#define SAPPNAME "Notepad3" +#define VERSION_MAJOR 5 +#define VERSION_MINOR 19 +#define VERSION_REV 726 +#define VERSION_BUILD 2515 +#define SCINTILLA_VER 420 +#define ONIGURUMA_REGEX_VER 6.9.3 +#define VERSION_PATCH RC