Skip to content

Commit cc71d0f

Browse files
pmedpmed
committed
retarget Visual Studio solution to v142 toolset by default, update V8 package versions
Using v142 toolset from Visual C++ 2019 version. Updated V8 packages for Visual Studio 2019, updated their versions to 7.5 (x86), and 8.0 (x64) Removed Visual C++ 2017 mention from the README.md Remove not existing old persistent.hpp from the Visual Studio solution
1 parent 08fa172 commit cc71d0f

9 files changed

+62
-85
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Header-only library to expose C++ classes and functions into [V8](https://developers.google.com/v8/) to use them in JavaScript code. v8pp uses heavy template metaprogramming and variadic template parameters which requires modern compiler with C++17 support. The library has been tested on:
99

10-
* Microsoft Visual C++ 2017/2019 (Windows 10)
10+
* Microsoft Visual C++ 2019 (Windows 10)
1111
* GCC 5.4.0 (Ubuntu 16.04)
1212
* Clang 5.0.0 (Ubuntu 16.04)
1313

‎plugins/console.vcxproj

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props" Condition="Exists('..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props')" />
4-
<Import Project="..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props" Condition="Exists('..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props')" />
5-
<Import Project="..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props" Condition="Exists('..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props')" />
6-
<Import Project="..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props" Condition="Exists('..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props')" />
3+
<Import Project="..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props" Condition="Exists('..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props')" />
74
<Import Project="..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props" Condition="Exists('..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props')" />
85
<Import Project="..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props" Condition="Exists('..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props')" />
9-
<Import Project="..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props" Condition="Exists('..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props')" />
10-
<Import Project="..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props" Condition="Exists('..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props')" />
6+
<Import Project="..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props" Condition="Exists('..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props')" />
7+
<Import Project="..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props" Condition="Exists('..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props')" />
8+
<Import Project="..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props" Condition="Exists('..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props')" />
119
<ItemGroup Label="ProjectConfigurations">
1210
<ProjectConfiguration Include="Debug|Win32">
1311
<Configuration>Debug</Configuration>
@@ -30,20 +28,20 @@
3028
<ProjectGuid>{967D7CE6-8AD1-465C-A838-0A7E666DC1AE}</ProjectGuid>
3129
<Keyword>Win32Proj</Keyword>
3230
<RootNamespace>console</RootNamespace>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
31+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3432
</PropertyGroup>
3533
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3634
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3735
<ConfigurationType>DynamicLibrary</ConfigurationType>
3836
<UseDebugLibraries>true</UseDebugLibraries>
3937
<CharacterSet>Unicode</CharacterSet>
40-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
4139
</PropertyGroup>
4240
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4341
<ConfigurationType>DynamicLibrary</ConfigurationType>
4442
<UseDebugLibraries>true</UseDebugLibraries>
4543
<CharacterSet>Unicode</CharacterSet>
46-
<PlatformToolset>v141</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4745
</PropertyGroup>
4846
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4947
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -55,7 +53,7 @@
5553
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5654
<ConfigurationType>DynamicLibrary</ConfigurationType>
5755
<UseDebugLibraries>false</UseDebugLibraries>
58-
<PlatformToolset>v141</PlatformToolset>
56+
<PlatformToolset>v142</PlatformToolset>
5957
<WholeProgramOptimization>true</WholeProgramOptimization>
6058
<CharacterSet>Unicode</CharacterSet>
6159
</PropertyGroup>
@@ -168,13 +166,11 @@
168166
<PropertyGroup>
169167
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
170168
</PropertyGroup>
171-
<Error Condition="!Exists('..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props'))" />
172-
<Error Condition="!Exists('..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props'))" />
169+
<Error Condition="!Exists('..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props'))" />
170+
<Error Condition="!Exists('..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props'))" />
171+
<Error Condition="!Exists('..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props'))" />
173172
<Error Condition="!Exists('..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props'))" />
174173
<Error Condition="!Exists('..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props'))" />
175-
<Error Condition="!Exists('..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props'))" />
176-
<Error Condition="!Exists('..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props'))" />
177-
<Error Condition="!Exists('..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props'))" />
178-
<Error Condition="!Exists('..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props'))" />
174+
<Error Condition="!Exists('..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props'))" />
179175
</Target>
180176
</Project>

‎plugins/file.vcxproj

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props" Condition="Exists('..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props')" />
4-
<Import Project="..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props" Condition="Exists('..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props')" />
5-
<Import Project="..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props" Condition="Exists('..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props')" />
6-
<Import Project="..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props" Condition="Exists('..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props')" />
3+
<Import Project="..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props" Condition="Exists('..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props')" />
74
<Import Project="..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props" Condition="Exists('..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props')" />
85
<Import Project="..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props" Condition="Exists('..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props')" />
9-
<Import Project="..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props" Condition="Exists('..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props')" />
10-
<Import Project="..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props" Condition="Exists('..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props')" />
6+
<Import Project="..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props" Condition="Exists('..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props')" />
7+
<Import Project="..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props" Condition="Exists('..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props')" />
8+
<Import Project="..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props" Condition="Exists('..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props')" />
119
<ItemGroup Label="ProjectConfigurations">
1210
<ProjectConfiguration Include="Debug|Win32">
1311
<Configuration>Debug</Configuration>
@@ -30,20 +28,20 @@
3028
<ProjectGuid>{300469B1-31DA-4485-A75B-111C78697B16}</ProjectGuid>
3129
<Keyword>Win32Proj</Keyword>
3230
<RootNamespace>file</RootNamespace>
33-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
31+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3432
</PropertyGroup>
3533
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3634
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3735
<ConfigurationType>DynamicLibrary</ConfigurationType>
3836
<UseDebugLibraries>true</UseDebugLibraries>
3937
<CharacterSet>Unicode</CharacterSet>
40-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
4139
</PropertyGroup>
4240
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4341
<ConfigurationType>DynamicLibrary</ConfigurationType>
4442
<UseDebugLibraries>true</UseDebugLibraries>
4543
<CharacterSet>Unicode</CharacterSet>
46-
<PlatformToolset>v141</PlatformToolset>
44+
<PlatformToolset>v142</PlatformToolset>
4745
</PropertyGroup>
4846
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4947
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -55,7 +53,7 @@
5553
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5654
<ConfigurationType>DynamicLibrary</ConfigurationType>
5755
<UseDebugLibraries>false</UseDebugLibraries>
58-
<PlatformToolset>v141</PlatformToolset>
56+
<PlatformToolset>v142</PlatformToolset>
5957
<WholeProgramOptimization>true</WholeProgramOptimization>
6058
<CharacterSet>Unicode</CharacterSet>
6159
</PropertyGroup>
@@ -168,13 +166,11 @@
168166
<PropertyGroup>
169167
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
170168
</PropertyGroup>
171-
<Error Condition="!Exists('..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v140-x86.7.4.288.11\build\native\v8.redist-v140-x86.props'))" />
172-
<Error Condition="!Exists('..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v140-x86.7.4.288.11\build\native\v8-v140-x86.props'))" />
169+
<Error Condition="!Exists('..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v142-x64.8.0.426.28\build\native\v8.redist-v142-x64.props'))" />
170+
<Error Condition="!Exists('..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v142-x64.8.0.426.28\build\native\v8-v142-x64.props'))" />
171+
<Error Condition="!Exists('..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.symbols-v142-x64.8.0.426.28\build\native\v8.symbols-v142-x64.props'))" />
173172
<Error Condition="!Exists('..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v142-x86.7.5.288.23\build\native\v8.redist-v142-x86.props'))" />
174173
<Error Condition="!Exists('..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v142-x86.7.5.288.23\build\native\v8-v142-x86.props'))" />
175-
<Error Condition="!Exists('..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v141-x64.7.4.288.26\build\native\v8.redist-v141-x64.props'))" />
176-
<Error Condition="!Exists('..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v141-x64.7.4.288.26\build\native\v8-v141-x64.props'))" />
177-
<Error Condition="!Exists('..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.redist-v141-x86.7.4.288.28\build\native\v8.redist-v141-x86.props'))" />
178-
<Error Condition="!Exists('..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8-v141-x86.7.4.288.28\build\native\v8-v141-x86.props'))" />
174+
<Error Condition="!Exists('..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\v8.symbols-v142-x86.7.5.288.23\build\native\v8.symbols-v142-x86.props'))" />
179175
</Target>
180176
</Project>

‎plugins/packages.config

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="v8.redist-v140-x86" version="7.4.288.11" targetFramework="native" />
4-
<package id="v8.redist-v141-x64" version="7.4.288.26" targetFramework="native" />
5-
<package id="v8.redist-v141-x86" version="7.4.288.28" targetFramework="native" />
3+
<package id="v8.redist-v142-x64" version="8.0.426.28" targetFramework="native" />
64
<package id="v8.redist-v142-x86" version="7.5.288.23" targetFramework="native" />
7-
<package id="v8-v140-x86" version="7.4.288.11" targetFramework="native" />
8-
<package id="v8-v141-x64" version="7.4.288.26" targetFramework="native" />
9-
<package id="v8-v141-x86" version="7.4.288.28" targetFramework="native" />
5+
<package id="v8.symbols-v142-x64" version="8.0.426.28" targetFramework="native" />
6+
<package id="v8.symbols-v142-x86" version="7.5.288.23" targetFramework="native" />
7+
<package id="v8-v142-x64" version="8.0.426.28" targetFramework="native" />
108
<package id="v8-v142-x86" version="7.5.288.23" targetFramework="native" />
119
</packages>

‎test/packages.config

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="v8.redist-v140-x86" version="7.4.288.11" targetFramework="native" />
4-
<package id="v8.redist-v141-x64" version="7.4.288.26" targetFramework="native" />
5-
<package id="v8.redist-v141-x86" version="7.4.288.28" targetFramework="native" />
3+
<package id="v8.redist-v142-x64" version="8.0.426.28" targetFramework="native" />
64
<package id="v8.redist-v142-x86" version="7.5.288.23" targetFramework="native" />
7-
<package id="v8-v140-x86" version="7.4.288.11" targetFramework="native" />
8-
<package id="v8-v141-x64" version="7.4.288.26" targetFramework="native" />
9-
<package id="v8-v141-x86" version="7.4.288.28" targetFramework="native" />
5+
<package id="v8.symbols-v142-x64" version="8.0.426.28" targetFramework="native" />
6+
<package id="v8.symbols-v142-x86" version="7.5.288.23" targetFramework="native" />
7+
<package id="v8-v142-x64" version="8.0.426.28" targetFramework="native" />
108
<package id="v8-v142-x86" version="7.5.288.23" targetFramework="native" />
119
</packages>

0 commit comments

Comments
 (0)