CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fix: version and build information templates

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-12-15 08:53:12 +01:00
parent 104b5b3278
commit e45494ed70
9 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Version.ps1
View File

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

BIN
Versions/VersionEx.h.tpl
View File

Binary file not shown.

2
Versions/build.txt
View File

@ -1 +1 @@
729
744

1
onigmo/version.txt Normal file
View File

@ -0,0 +1 @@
6.1.3

2
res/Notepad3.exe.manifest.conf
View File

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

15
src/Notepad3.vcxproj
View File

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

17
src/Notepad3.vcxproj.filters
View File

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

2
src/Version.h
View File

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

10
src/VersionEx.h
View File

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