From e45494ed700ea1aec44b733c101fcfc34a710079 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Fri, 15 Dec 2017 08:53:12 +0100
Subject: [PATCH] + fix: version and build information templates

---
 Version.ps1                    |   3 +++
 Versions/VersionEx.h.tpl       | Bin 310 -> 1016 bytes
 Versions/build.txt             |   2 +-
 onigmo/version.txt             |   1 +
 res/Notepad3.exe.manifest.conf |   2 +-
 src/Notepad3.vcxproj           |  15 +++++++++++++++
 src/Notepad3.vcxproj.filters   |  17 +++++++++++++++++
 src/Version.h                  |   2 +-
 src/VersionEx.h                |  10 ++++++++--
 9 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 onigmo/version.txt

diff --git a/Version.ps1 b/Version.ps1
index f0ef4075d..061ac12f0 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -43,6 +43,8 @@ try
 	if (!$Build) { $Build = 0 }
 	$SciVer = [int](Get-Content "scintilla\version.txt")
 	if (!$SciVer) { $SciVer = 0 }
+	$OnigmoVer = [string](Get-Content "onigmo\version.txt")
+	if (!$OnigmoVer) { $OnigmoVer = "0.0.0" }
 	
 	$CompleteVer = "$Major.$Minor.$Revis.$Build"
 	DebugOutput("Version number: '$CompleteVer'")
@@ -53,6 +55,7 @@ try
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAINT\$', "$Revis" } | Set-Content "src\VersionEx.h"
 	(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"
 	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"
 	if ($AppVeyorEnv) {
diff --git a/Versions/VersionEx.h.tpl b/Versions/VersionEx.h.tpl
index 5a4ef48638336e87c0f74d150223b4d65bd62077..1f4a8eab1633720f70fa7e1f82b3aa627ed7870d 100644
GIT binary patch
literal 1016
zcmcgp%L>9k44kvzKNRd$`VGD)m1?2Y;;j_l;0vt>e_oyJs#~Q{Ps<WE$!0Ri?Bnji
zgF~}_nrJ9ihx~Sr>}uExY_P?JGpu;;u%xHsHT?taj2s2;1z*~<E32hSa(kSJ(eIKu
zGM_Ui*&F>iyXWj8y@W$+ZP@K@{>yIv*R}F3YPnQ;i@pw03=kthfCyt`7@>n9{g`iV
zDRR}n)uRJ;G3a;nA3EkN>4#Ua6V4z%R>#}LlpBQTE3}EK(FuC2mhOTHxpDT=L3Y-!
aT9<0PC>6k`IuVgFwNIOUbt%`Bdp!Y>M{^7S

delta 16
YcmeytzKx0L|G&w4%nF-lFo`e%06cyL{Qv*}

diff --git a/Versions/build.txt b/Versions/build.txt
index 1f276db26..064c0200b 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-729
+744
diff --git a/onigmo/version.txt b/onigmo/version.txt
new file mode 100644
index 000000000..88d06f108
--- /dev/null
+++ b/onigmo/version.txt
@@ -0,0 +1 @@
+6.1.3
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 25d8811ac..cffb6ae2d 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="3.17.1210.729"
+    version="3.17.1215.744"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj
index 41db756d5..1735a0f83 100644
--- a/src/Notepad3.vcxproj
+++ b/src/Notepad3.vcxproj
@@ -324,6 +324,7 @@
     <ClInclude Include="Styles.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Version.h" />
+    <ClInclude Include="VersionEx.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\res\Copy.cur" />
@@ -335,6 +336,8 @@
     <None Include="..\res\Run.ico" />
     <None Include="..\res\Styles.ico" />
     <None Include="..\res\Toolbar.bmp" />
+    <None Include="..\Versions\Notepad3.exe.manifest.tpl" />
+    <None Include="..\Versions\VersionEx.h.tpl" />
     <None Include="Notepad3.ver" />
   </ItemGroup>
   <ItemGroup>
@@ -354,6 +357,18 @@
     <Image Include="..\res\Notepad3.ico" />
     <Image Include="..\res\Toolbar2.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\Versions\build.txt">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </ExcludedFromBuild>
+    </Text>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/Notepad3.vcxproj.filters b/src/Notepad3.vcxproj.filters
index 17ea04918..330b76499 100644
--- a/src/Notepad3.vcxproj.filters
+++ b/src/Notepad3.vcxproj.filters
@@ -16,6 +16,9 @@
     <Filter Include="Crypto">
       <UniqueIdentifier>{aad339da-f291-4358-9ab1-a0fdee012ac6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="templates">
+      <UniqueIdentifier>{e817f780-f742-48b4-bc9c-2ab762ced6bc}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Dialogs.c">
@@ -92,6 +95,9 @@
     <ClInclude Include="..\crypto\sha-256.h">
       <Filter>Crypto</Filter>
     </ClInclude>
+    <ClInclude Include="VersionEx.h">
+      <Filter>Resource Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\res\Copy.cur">
@@ -124,6 +130,12 @@
     <None Include="Notepad3.ver">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="..\Versions\Notepad3.exe.manifest.tpl">
+      <Filter>templates</Filter>
+    </None>
+    <None Include="..\Versions\VersionEx.h.tpl">
+      <Filter>templates</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\res\Notepad3.ico">
@@ -143,4 +155,9 @@
       <Filter>Resource Files</Filter>
     </Manifest>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\Versions\build.txt">
+      <Filter>templates</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Version.h b/src/Version.h
index 747b89f60..948be4962 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -41,7 +41,7 @@
 #define VERSION_COMPANYNAME          L"© Rizonesoft"
 #define VERSION_MODPAGEDISPLAY       L"https://xhmikosr.github.io/notepad2-mod/"
 #define VERSION_WEBPAGE2DISPLAY      L"http://www.flos-freeware.ch"
-#define VERSION_SCIVERSION           L"Scintilla Library (RegEx:Onigmo v.6.1.3) Version: " STRINGIFY(SCINTILLA_VER)
+#define VERSION_SCIVERSION           L"Scintilla Library Ver: " STRINGIFY(SCINTILLA_VER) L"  (RegEx:Onigmo v." STRINGIFY(ONIGMO_REGEX_VER) L")"
 
 #if defined(_WIN64)
 //   #define VERSION_FILEVERSION_LONG  L"Notepad3 (64-bit) " STRINGIFY(VERSION_MAJOR) L" Build " \
diff --git a/src/VersionEx.h b/src/VersionEx.h
index ec3d09f3b..6a6bccdc9 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,5 +1,11 @@
+// //////////////////////////////////////////////////////////
+//                                                         //
+// this file is generated - use template to apply changes  //
+//                                                         //
+// //////////////////////////////////////////////////////////
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 17
-#define VERSION_REV 1210
-#define VERSION_BUILD 729
+#define VERSION_REV 1215
+#define VERSION_BUILD 744
 #define SCINTILLA_VER 402
+#define ONIGMO_REGEX_VER 6.1.3