diff --git a/Build/make_zip.bat b/Build/make_zip.bat index 5b956dc4a..b378b2e33 100644 --- a/Build/make_zip.bat +++ b/Build/make_zip.bat @@ -25,8 +25,8 @@ IF /I "%~1" == "/?" GOTO SHOWHELP rem IF EXIST "%~dp0..\signinfo_notepad3.txt" SET "SIGN=True" -SET INPUTDIRx86=bin\Release_x86_v141_xp -SET INPUTDIRx64=bin\Release_x64_v141_xp +SET INPUTDIRx86=bin\Release_x86_v141 +SET INPUTDIRx64=bin\Release_x64_v141 SET "TEMP_NAME=temp_zip" IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!" diff --git a/Build/upx.bat b/Build/upx.bat index 5e73ceec1..559b62e3b 100644 --- a/Build/upx.bat +++ b/Build/upx.bat @@ -16,8 +16,8 @@ rem **************************************************************************** SETLOCAL ENABLEEXTENSIONS CD /D %~dp0 -SET INPUTDIRx86=Bin\Release_x86_v141_xp -SET INPUTDIRx64=Bin\Release_x64_v141_xp +SET INPUTDIRx86=Bin\Release_x86_v141 +SET INPUTDIRx64=Bin\Release_x64_v141 IF NOT EXIST "..\%INPUTDIRx86%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x86 first!" IF NOT EXIST "..\%INPUTDIRx64%\Notepad3.exe" CALL :SUBMSG "ERROR" "Compile Notepad3 x64 first!" diff --git a/Version.exe b/Version.exe new file mode 100644 index 000000000..7770e8485 Binary files /dev/null and b/Version.exe differ diff --git a/Version.ini b/Version.ini new file mode 100644 index 000000000..564454a00 --- /dev/null +++ b/Version.ini @@ -0,0 +1,10 @@ +[Version] +; Major +; Minor +; Maintenance: 0 - prototype, 1 - beta, 2 - release candidate, 3 - final release +; Build number auto increments. +Version=2.0.2.468 + +[Templates] +Versions\VersionEx.h.tpl = src\VersionEx.h +Versions\Notepad3.exe.manifest.tpl = res\Notepad3.exe.manifest.conf diff --git a/distrib/Notepad3_2.0.2.468.exe b/distrib/Notepad3_2.0.2.468.exe new file mode 100644 index 000000000..209aed8be Binary files /dev/null and b/distrib/Notepad3_2.0.2.468.exe differ diff --git a/distrib/Notepad3_x_2.0.2.468.exe b/distrib/Notepad3_x_2.0.2.468.exe new file mode 100644 index 000000000..bba9b651d Binary files /dev/null and b/distrib/Notepad3_x_2.0.2.468.exe differ diff --git a/distrib/notepad3_setup.iss b/distrib/notepad3_setup.iss index a19dc3400..2e087f62c 100644 --- a/distrib/notepad3_setup.iss +++ b/distrib/notepad3_setup.iss @@ -12,30 +12,30 @@ #define bindir "..\Bin" -#ifnexist bindir + "\Release_x86_v141_xp\Notepad3.exe" +#ifnexist bindir + "\Release_x86_v141\Notepad3.exe" #error Compile Notepad3 x86 first #endif -#ifnexist bindir + "\Release_x86_v141_xp\minipath.exe" +#ifnexist bindir + "\Release_x86_v141\minipath.exe" #error Compile MiniPath x86 first #endif -#ifnexist bindir + "\Release_x86_v141_xp\np3encrypt.exe" +#ifnexist bindir + "\Release_x86_v141\np3encrypt.exe" #error Compile np3encrypt.exe x86 first #endif -#ifnexist bindir + "\Release_x64_v141_xp\Notepad3.exe" +#ifnexist bindir + "\Release_x64_v141\Notepad3.exe" #error Compile Notepad3 x64 first #endif -#ifnexist bindir + "\Release_x64_v141_xp\minipath.exe" +#ifnexist bindir + "\Release_x64_v141\minipath.exe" #error Compile MiniPath x64 first #endif - #ifnexist bindir + "\Release_x64_v141_xp\np3encrypt.exe" + #ifnexist bindir + "\Release_x64_v141\np3encrypt.exe" #error Compile np3encrypt.exe x64 first #endif -#define app_version GetFileVersion(bindir + "\Release_x86_v141_xp\Notepad3.exe") +#define app_version GetFileVersion(bindir + "\Release_x86_v141\Notepad3.exe") #define app_name "Notepad3" #define app_copyright "Copyright © 2008-2016, Rizonesoft." #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch" @@ -123,16 +123,16 @@ Name: remove_default; Description: {cm:tsk_RemoveDefault}; GroupDescript [Files] -Source: {#bindir}\Release_x64_v141_xp\Notepad3.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v141_xp\Notepad3.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_xp\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v141_xp\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode() +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_xp\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v141_xp\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode() +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() [Dirs] Name: "{userappdata}\Rizonesoft\Notepad3\Favorites" diff --git a/distrib/notepad3_setup_2.iss b/distrib/notepad3_setup_2.iss index 4b05292aa..09cddb7b8 100644 --- a/distrib/notepad3_setup_2.iss +++ b/distrib/notepad3_setup_2.iss @@ -12,31 +12,31 @@ #define bindir "..\Bin" -#ifnexist bindir + "\Release_x86_v141_xp\Notepad3.exe" +#ifnexist bindir + "\Release_x86_v141\Notepad3.exe" #error Compile Notepad3 x86 first #endif -#ifnexist bindir + "\Release_x86_v141_xp\minipath.exe" +#ifnexist bindir + "\Release_x86_v141\minipath.exe" #error Compile MiniPath x86 first #endif -#ifnexist bindir + "\Release_x86_v141_xp\np3encrypt.exe" +#ifnexist bindir + "\Release_x86_v141\np3encrypt.exe" #error Compile np3encrypt.exe x86 first #endif -#ifnexist bindir + "\Release_x64_v141_xp\Notepad3.exe" +#ifnexist bindir + "\Release_x64_v141\Notepad3.exe" #error Compile Notepad3 x64 first #endif -#ifnexist bindir + "\Release_x64_v141_xp\minipath.exe" +#ifnexist bindir + "\Release_x64_v141\minipath.exe" #error Compile MiniPath x64 first #endif -#ifnexist bindir + "\Release_x64_v141_xp\np3encrypt.exe" +#ifnexist bindir + "\Release_x64_v141\np3encrypt.exe" #error Compile np3encrypt.exe x64 first #endif -#define app_version GetFileVersion(bindir + "\Release_x86_v141_xp\Notepad3.exe") +#define app_version GetFileVersion(bindir + "\Release_x86_v141\Notepad3.exe") #define app_name "Notepad3" #define app_copyright "Copyright © 2008-2016, Rizonesoft." #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch" @@ -120,16 +120,16 @@ Name: reset_settings; Description: {cm:tsk_ResetSettings}; GroupDescript [Files] -Source: {#bindir}\Release_x64_v141_xp\Notepad3.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v141_xp\Notepad3.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_xp\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v141_xp\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode() +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_xp\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: Is64BitInstallMode() -Source: {#bindir}\Release_x86_v141_xp\np3encrypt.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode() +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() [Dirs] Name: "{userappdata}\Rizonesoft\Notepad3\Favorites" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 276fb157b..1647bf590 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/VersionEx.h b/src/VersionEx.h index db5506ec6..321f0b162 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,4 +1,4 @@ #define VERSION_MAJOR 2 #define VERSION_MINOR 0 #define VERSION_REV 2 -#define VERSION_BUILD 450 +#define VERSION_BUILD 468