From c9a878f79056f5beb3bf409a3fb6a20625436b53 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 01:49:07 +0200 Subject: [PATCH 1/7] Attempting to remedy build failure. --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 634a08341..3aedf24eb 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -783 +784 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 3517bc353..02803f056 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 b0cfe152e..f6201b6bc 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -4,8 +4,8 @@ // // // ////////////////////////////////////////////////////////// #define VERSION_MAJOR 3 -#define VERSION_MINOR 17 -#define VERSION_REV 1228 -#define VERSION_BUILD 783 +#define VERSION_MINOR 18 +#define VERSION_REV 102 +#define VERSION_BUILD 784 #define SCINTILLA_VER 402 #define ONIGMO_REGEX_VER 6.1.3 From e47abebaf005c5dcd2f9b9d09e7a8d3ecf9f00c6 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 02:08:54 +0200 Subject: [PATCH 2/7] Fixing Version.ps1 script. --- Version.ps1 | 2 +- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Version.ps1 b/Version.ps1 index 061ac12f0..28e102bc2 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -33,7 +33,7 @@ try { $Major = 3 $Minor = [int]$(Get-Date -format yy) - $Revis = [int]$(Get-Date -format Mdd) + $Revis = "{0:D4}" -f [int]$(Get-Date -format MMdd) if ($AppVeyorEnv) { $Build = [int]($env:appveyor_build_number) } diff --git a/Versions/build.txt b/Versions/build.txt index 3aedf24eb..b371f5ce8 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -784 +794 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 02803f056..38b7caf81 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 f6201b6bc..a163cdade 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -5,7 +5,7 @@ // ////////////////////////////////////////////////////////// #define VERSION_MAJOR 3 #define VERSION_MINOR 18 -#define VERSION_REV 102 -#define VERSION_BUILD 784 +#define VERSION_REV 0102 +#define VERSION_BUILD 794 #define SCINTILLA_VER 402 #define ONIGMO_REGEX_VER 6.1.3 From e3bf279b3a6793602a0a3cde47f342d281767929 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 02:35:56 +0200 Subject: [PATCH 3/7] Another attempt to fix version testing. --- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index b371f5ce8..114370ffb 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -794 +795 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 38b7caf81..ceef685ba 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 a163cdade..4769b32fa 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -6,6 +6,6 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 18 #define VERSION_REV 0102 -#define VERSION_BUILD 794 +#define VERSION_BUILD 795 #define SCINTILLA_VER 402 #define ONIGMO_REGEX_VER 6.1.3 From 6e0d4a3431c4ccc820c70bdcd2b9380454da2513 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 02:41:03 +0200 Subject: [PATCH 4/7] Still fixing version test --- Version.ps1 | 2 +- test/TestFileVersion.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Version.ps1 b/Version.ps1 index 28e102bc2..aeae4aec1 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -33,7 +33,7 @@ try { $Major = 3 $Minor = [int]$(Get-Date -format yy) - $Revis = "{0:D4}" -f [int]$(Get-Date -format MMdd) + $Revis = [int]$(Get-Date -format MMdd) if ($AppVeyorEnv) { $Build = [int]($env:appveyor_build_number) } diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index 46d9d33a3..b68d1f8a2 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -9,7 +9,7 @@ set NP3_BUILD_VER=%SCRIPT_DIR%..\Versions\build.txt :: -------------------------------------------------------------------------------------------------------------------- set YY=00 -set MM=00 +set MM=0 set DD=00 call :GETDATE set BUILD=0 From 9edc4b95b40dda9640307aabe93cc38d1fdfd1db Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 02:44:53 +0200 Subject: [PATCH 5/7] Last attempt to fix version testing --- test/TestFileVersion.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index b68d1f8a2..7e857a951 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -9,7 +9,7 @@ set NP3_BUILD_VER=%SCRIPT_DIR%..\Versions\build.txt :: -------------------------------------------------------------------------------------------------------------------- set YY=00 -set MM=0 +set MM=00 set DD=00 call :GETDATE set BUILD=0 @@ -57,7 +57,7 @@ goto:EOF for /f "tokens=2 delims==" %%a in (' wmic OS Get localdatetime /value ') do set "dt=%%a" -set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%" +set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,1%" & set "DD=%dt:~6,2%" set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%" ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%" ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%" From 8582c6abfb1df7b7b9b1c27482e68c5db07798f7 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 02:49:34 +0200 Subject: [PATCH 6/7] Still fixing version test --- test/TestFileVersion.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index 7e857a951..3def5c5c9 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -57,7 +57,7 @@ goto:EOF for /f "tokens=2 delims==" %%a in (' wmic OS Get localdatetime /value ') do set "dt=%%a" -set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,1%" & set "DD=%dt:~6,2%" +set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%Month%" & set "DD=%dt:~6,2%" set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%" ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%" ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%" From 9738127e3b652ddfe71b6e6ad0a175145aec8eac Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Tue, 2 Jan 2018 03:01:49 +0200 Subject: [PATCH 7/7] Fixing version test --- test/TestFileVersion.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index 3def5c5c9..58eebc4c8 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -57,7 +57,7 @@ goto:EOF for /f "tokens=2 delims==" %%a in (' wmic OS Get localdatetime /value ') do set "dt=%%a" -set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%Month%" & set "DD=%dt:~6,2%" +set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~5,1%" & set "DD=%dt:~6,2%" set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%" ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%" ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%"