From b4f1e563aa9a2536d462d090e347b7ed0a752e56 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Wed, 7 Mar 2018 09:13:47 +0100 Subject: [PATCH 1/2] + add: version string patching commands for different local builds --- Version.ps1 | 15 +++++++-------- Version_RC.cmd | 2 ++ Version_develop.cmd | 2 ++ Versions/VersionEx.h.tpl | Bin 1148 -> 1164 bytes Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/Notepad3.rc | 4 ++-- src/Version.h | Bin 24520 -> 24538 bytes src/VersionEx.h | 8 ++++---- 9 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 Version_RC.cmd create mode 100644 Version_develop.cmd diff --git a/Version.ps1 b/Version.ps1 index 3b3f11109..e0bb5166d 100644 --- a/Version.ps1 +++ b/Version.ps1 @@ -4,7 +4,8 @@ # - adapt $Build number in case of local machine builds # ------------------------------------------------------------ param( - [switch]$AppVeyorEnv = $false + [switch]$AppVeyorEnv = $false, + [string]$VerPatch = "" ) # ------------------------------------------------------------ Set-StrictMode -Version Latest @@ -34,15 +35,11 @@ try $Major = 3 $Minor = [int]$(Get-Date -format yy) $Revis = [int]$(Get-Date -format MMdd) - $BetaVer = 'L" "' - $BetaVerA = '" "' if ($AppVeyorEnv) { $Build = [int]($env:appveyor_build_number) } else { $Build = [int](Get-Content "Versions\build.txt") + 1 - #$BetaVer = 'L" develop "' - #$BetaVerA = '" develop "' } if (!$Build) { $Build = 0 } $SciVer = [int](Get-Content "scintilla\version.txt") @@ -51,7 +48,9 @@ try if (!$OnigmoVer) { $OnigmoVer = "0.0.0" } $CompleteVer = "$Major.$Minor.$Revis.$Build" - DebugOutput("Version number: '$CompleteVer'") + DebugOutput("Version number: '$VerPatch v$CompleteVer'") + +if ($VerPatch) { $VerPatch = " $VerPatch" } # ensure space in front of string Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAJOR\$', "$Major" } | Set-Content "src\VersionEx.h" @@ -60,8 +59,8 @@ try (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BUILD\$', "$Build" } | Set-Content "src\VersionEx.h" (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h" (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$ONIGMOVER\$', "$OnigmoVer" } | Set-Content "src\VersionEx.h" - (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BETAVER\$', "$BetaVer" } | Set-Content "src\VersionEx.h" - (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BETAVERA\$', "$BetaVerA" } | Set-Content "src\VersionEx.h" + (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h" + (Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h" Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force (Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf" diff --git a/Version_RC.cmd b/Version_RC.cmd new file mode 100644 index 000000000..f821f134a --- /dev/null +++ b/Version_RC.cmd @@ -0,0 +1,2 @@ +@echo off +Version -VerPatch "RC" diff --git a/Version_develop.cmd b/Version_develop.cmd new file mode 100644 index 000000000..224eff83d --- /dev/null +++ b/Version_develop.cmd @@ -0,0 +1,2 @@ +@echo off +Version -VerPatch "develop" diff --git a/Versions/VersionEx.h.tpl b/Versions/VersionEx.h.tpl index 319d1f967cc56a95add7e1d3fc95cf9868bd5b8e..7182471bc627b1e33547ecc837abfbc0e95cc9d4 100644 GIT binary patch delta 94 zcmeyv(Zjhxf<-le!I2?^!I{B>L4m=CL5V?yA&kM5A&3DXuEL-+c_Wjujw3@nlBfbM KwG6xrTnqpKVh$Am delta 74 zcmeC-{KK(9f<@Sg!IdF|!I43ML4^Uzo;;sfcCsBa-{b@q79}k53}HY$K|nn!47?0n F3;-AZ3@ZQt diff --git a/Versions/build.txt b/Versions/build.txt index f0a9f26fc..6a21a128a 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -916 +918 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 13aaeb291..51a0f6a10 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 2c0eef07b..7575de808 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -638,7 +638,7 @@ END // Dialog // -IDD_ABOUT DIALOGEX 0, 0, 400, 275 +IDD_ABOUT DIALOGEX 0, 0, 400, 274 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About Notepad3" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -653,7 +653,7 @@ BEGIN CONTROL "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,190,55,100,10 CONTROL IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZEIMAGE,305,7,130,20,WS_EX_TRANSPARENT PUSHBUTTON "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT - CONTROL "",IDC_RICHEDITABOUT,"RichEdit20W",WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170 + CONTROL "",IDC_RICHEDITABOUT,"RichEdit20W",WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,168 END IDD_FIND DIALOGEX 0, 0, 273, 129 diff --git a/src/Version.h b/src/Version.h index 4e402771683fc80630974f8e0143bb9a1fefdcba..24e84df09436b27158c0948097e7ce217a804fab 100644 GIT binary patch delta 121 zcmX@HpYhgy#tpkTHoxNtVVb;+!(_7)cM+Rl0D~h#2!k_&2ZI8G4}%he!sLU3TltYi jfnu8*h4L9EFA@~Os=RaZG!Y?mEt4CC%s0Ohx#tA{!p1|lVs g{e*OQ5pob2-OW3M92h4r5fs3otqqHoFCx#p08%v|qyPW_ diff --git a/src/VersionEx.h b/src/VersionEx.h index 9156b81af..29bb6435f 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -5,9 +5,9 @@ // ////////////////////////////////////////////////////////// #define VERSION_MAJOR 3 #define VERSION_MINOR 18 -#define VERSION_REV 303 -#define VERSION_BUILD 916 +#define VERSION_REV 307 +#define VERSION_BUILD 918 #define SCINTILLA_VER 403 #define ONIGMO_REGEX_VER 6.1.3 -#define VERSION_BETA L" " -#define VERSIONA_BETA " " +#define VERSION_PATCH L"" +#define VERSIONA_PATCH "" From 7db173c208f8c140606905cce2e28de470790beb Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Wed, 7 Mar 2018 09:58:58 +0100 Subject: [PATCH 2/2] + add: new VS C++ compiler version (191326128) => Info AboutBox --- src/Version.h | Bin 24538 -> 24748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/Version.h b/src/Version.h index 24e84df09436b27158c0948097e7ce217a804fab..613caad23270c2f8699c30a6af9354fb5174d58e 100644 GIT binary patch delta 39 ucmcb$pK;AW#tj$zxs4f&7|a+9fuzOc#GrCkGX^~dgURs$p^I<%3jhH9C=22M delta 17 ZcmZ2;knz@j#tj$zC)WgWEnX8K002)C2k`&^