Skip to content

Commit d38f0c3

Browse files
authored
Add v142 toolset support (#2)
* Updated build script, made the README a bit more useful. Updated to v142 platform toolset and nonspecific (latest) Windows 10.0 SDK. * Updated copyright year. * Updated release notes. * Bumped version number to 1.1.3.1.
1 parent 956c5df commit d38f0c3

6 files changed

Lines changed: 22 additions & 12 deletions

File tree

BuildNugetPackage.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@echo off
22

3-
@echo Building Debug and Release configurations of log4cpp and producing NuGet package for Win32 platform. Only Win32 is supported at this time.
3+
@echo Building Debug and Release configurations of log4cpp and producing NuGet package for Win32 platform.
44

55
MSBuild BuildNugetPackage.vcxproj /p:Platform=Win32 /p:Configuration=Debug
66
MSBuild BuildNugetPackage.vcxproj /p:Platform=Win32 /p:Configuration=Release

BuildNugetPackage.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<VCProjectVersion>15.0</VCProjectVersion>
1515
<ProjectGuid>{63CDD9E5-71B9-4765-86A1-760447B2FFF7}</ProjectGuid>
1616
<RootNamespace>BuildNugetPackage</RootNamespace>
17-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
21-
<PlatformToolset>v141</PlatformToolset>
21+
<PlatformToolset>v142</PlatformToolset>
2222
</PropertyGroup>
2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
24-
<PlatformToolset>v141</PlatformToolset>
24+
<PlatformToolset>v142</PlatformToolset>
2525
</PropertyGroup>
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2727
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

README

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
### This is a repository for building a NuGet package of log4cpp.
2+
3+
The log4cpp project is located here: https://sourceforge.net/p/log4cpp/
4+
5+
6+
## Building instructions
7+
8+
0. Prerequisites: vc142 toolset (installed with MS Visual Studio 2019 or as part of associated build tools); `cmake`, `MSBuild` and `nuget` on the PATH
9+
1. Clone the repository
10+
2. Run `BuildNugetPackage.cmd`
11+
3. Test the resulting package by following the instructions in the README in the _./nuget-sample_ directory.
12+

nuget-sample/NugetSample.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
<ProjectGuid>{06AD3408-C375-4EBE-8044-1BC68A3E1587}</ProjectGuid>
1616
<Keyword>Win32Proj</Keyword>
1717
<RootNamespace>NugetSample</RootNamespace>
18-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
18+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2222
<ConfigurationType>Application</ConfigurationType>
2323
<UseDebugLibraries>true</UseDebugLibraries>
24-
<PlatformToolset>v141</PlatformToolset>
24+
<PlatformToolset>v142</PlatformToolset>
2525
<CharacterSet>Unicode</CharacterSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>false</UseDebugLibraries>
30-
<PlatformToolset>v141</PlatformToolset>
30+
<PlatformToolset>v142</PlatformToolset>
3131
<WholeProgramOptimization>true</WholeProgramOptimization>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>

nuget/log4cpp.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>log4cpp</id>
5-
<version>1.1.3</version>
5+
<version>1.1.3.1</version>
66
<title>log4cpp</title>
77
<authors>MikeAirey</authors>
88
<owners>MikeAirey</owners>
99
<projectUrl>https://sourceforge.net/projects/log4cpp/</projectUrl>
1010
<license type="expression">LGPL-2.1-or-later</license>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>NuGet package of log4cpp, a C++ logging framework. The repository used to create this package https://github.com/MikeAirey/log4cpp was forked from the official log4cpp project at https://sourceforge.net/p/log4cpp/codegit/. This package is versioned the same as the original framework. The forked repo will remain as thin a wrapper around the official log4cpp repo as possible, adding only what is necessary to produce the NuGet package.</description>
13-
<releaseNotes>First NuGet package release.</releaseNotes>
14-
<copyright>Package copyright Mike Airey &amp; University of Western Australia 2018. Log4cpp framework copyright log4pp project contributors as specified at https://sourceforge.net/projects/log4cpp/.</copyright>
13+
<releaseNotes>Updated to use vc142 tooling. Built from identical code to the 1.1.3 version; only the compiled artifacts are different.</releaseNotes>
14+
<copyright>Package copyright Mike Airey &amp; University of Western Australia 2021. Log4cpp framework copyright log4pp project contributors as specified at https://sourceforge.net/projects/log4cpp/.</copyright>
1515
<tags>log4cpp C++ native</tags>
1616
</metadata>
1717
</package>

0 commit comments

Comments
 (0)