Build 468 Released

This commit is contained in:
Derick Payne 2017-09-02 14:15:33 +02:00
parent eb6d1b0d7b
commit 1e3c0cbda2
10 changed files with 42 additions and 32 deletions

View File

@ -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!"

View File

@ -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!"

BIN
Version.exe Normal file

Binary file not shown.

10
Version.ini Normal file
View File

@ -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

Binary file not shown.

Binary file not shown.

View File

@ -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"

View File

@ -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"

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="2.0.2.450"
version="2.0.2.468"
type="win32"
/>
<description>Notepad3</description>

View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REV 2
#define VERSION_BUILD 450
#define VERSION_BUILD 468