Skip to content

Commit f4d77c2

Browse files
chcgchcg
committed
- start to adapt build configs as preparation for npp and x64 update
- use boost nuget packages for regex and python for vc140 - adapt UTF8Iterator to boost 1.66
1 parent fcc16cb commit f4d77c2

18 files changed

+149
-672
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*.vcproj.*.user
1616
*.vcxproj.*.user
1717
*.vcxproj.user
18+
*.vcxproj.filters
1819
*.sdf
1920
*.opensdf
2021
BuildLog.htm

‎NppPlugin/project/NppPlugin.vcxproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -24,17 +24,17 @@
2424
<ConfigurationType>StaticLibrary</ConfigurationType>
2525
<CharacterSet>Unicode</CharacterSet>
2626
<WholeProgramOptimization>true</WholeProgramOptimization>
27-
<PlatformToolset>v120_xp</PlatformToolset>
27+
<PlatformToolset>v140_xp</PlatformToolset>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>StaticLibrary</ConfigurationType>
3131
<CharacterSet>Unicode</CharacterSet>
32-
<PlatformToolset>v120_xp</PlatformToolset>
32+
<PlatformToolset>v140_xp</PlatformToolset>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<CharacterSet>Unicode</CharacterSet>
37-
<PlatformToolset>v120_xp</PlatformToolset>
37+
<PlatformToolset>v140_xp</PlatformToolset>
3838
</PropertyGroup>
3939
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4040
<ImportGroup Label="ExtensionSettings">
@@ -74,8 +74,7 @@
7474
<ClCompile>
7575
<Optimization>Disabled</Optimization>
7676
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78-
<MinimalRebuild>true</MinimalRebuild>
77+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7978
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8079
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8180
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -88,8 +87,7 @@
8887
<ClCompile>
8988
<Optimization>Disabled</Optimization>
9089
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
91-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92-
<MinimalRebuild>true</MinimalRebuild>
90+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9391
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9492
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9593
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -101,7 +99,7 @@
10199
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102100
<ClCompile>
103101
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
104-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105103
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
106104
<PrecompiledHeader>Use</PrecompiledHeader>
107105
<WarningLevel>Level3</WarningLevel>

‎NppPlugin/project/NppPlugin.vcxproj.filters‎

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

‎PythonScript.Tests/PythonScript.Tests.vcxproj‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -24,20 +24,20 @@
2424
<ConfigurationType>Application</ConfigurationType>
2525
<UseDebugLibraries>true</UseDebugLibraries>
2626
<CharacterSet>Unicode</CharacterSet>
27-
<PlatformToolset>v120_xp</PlatformToolset>
27+
<PlatformToolset>v140_xp</PlatformToolset>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
3232
<CharacterSet>Unicode</CharacterSet>
33-
<PlatformToolset>v120_xp</PlatformToolset>
33+
<PlatformToolset>v140_xp</PlatformToolset>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<WholeProgramOptimization>true</WholeProgramOptimization>
3939
<CharacterSet>Unicode</CharacterSet>
40-
<PlatformToolset>v120_xp</PlatformToolset>
40+
<PlatformToolset>v140_xp</PlatformToolset>
4141
</PropertyGroup>
4242
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4343
<ImportGroup Label="ExtensionSettings">
@@ -58,17 +58,17 @@
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5959
<LinkIncremental>true</LinkIncremental>
6060
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
61-
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
61+
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)</LibraryPath>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
6464
<LinkIncremental>true</LinkIncremental>
6565
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
66-
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
66+
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)</LibraryPath>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6969
<LinkIncremental>false</LinkIncremental>
7070
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
71-
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
71+
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)</LibraryPath>
7272
</PropertyGroup>
7373
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7474
<ClCompile>
@@ -133,6 +133,7 @@
133133
</Link>
134134
</ItemDefinitionGroup>
135135
<ItemGroup>
136+
<None Include="packages.config" />
136137
<None Include="ReadMe.txt" />
137138
</ItemGroup>
138139
<ItemGroup>
@@ -162,5 +163,16 @@
162163
</ItemGroup>
163164
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
164165
<ImportGroup Label="ExtensionTargets">
166+
<Import Project="..\packages\boost.1.66.0.0\build\native\boost.targets" Condition="Exists('..\packages\boost.1.66.0.0\build\native\boost.targets')" />
167+
<Import Project="..\packages\boost_python-vc140.1.66.0.0\build\native\boost_python-vc140.targets" Condition="Exists('..\packages\boost_python-vc140.1.66.0.0\build\native\boost_python-vc140.targets')" />
168+
<Import Project="..\packages\boost_regex-vc140.1.66.0.0\build\native\boost_regex-vc140.targets" Condition="Exists('..\packages\boost_regex-vc140.1.66.0.0\build\native\boost_regex-vc140.targets')" />
165169
</ImportGroup>
170+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
171+
<PropertyGroup>
172+
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
173+
</PropertyGroup>
174+
<Error Condition="!Exists('..\packages\boost.1.66.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.66.0.0\build\native\boost.targets'))" />
175+
<Error Condition="!Exists('..\packages\boost_python-vc140.1.66.0.0\build\native\boost_python-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python-vc140.1.66.0.0\build\native\boost_python-vc140.targets'))" />
176+
<Error Condition="!Exists('..\packages\boost_regex-vc140.1.66.0.0\build\native\boost_regex-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_regex-vc140.1.66.0.0\build\native\boost_regex-vc140.targets'))" />
177+
</Target>
166178
</Project>

‎PythonScript.Tests/PythonScript.Tests.vcxproj.filters‎

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

‎PythonScript.Tests/gtest.proj/gtest.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -24,20 +24,20 @@
2424
<ConfigurationType>StaticLibrary</ConfigurationType>
2525
<UseDebugLibraries>true</UseDebugLibraries>
2626
<CharacterSet>Unicode</CharacterSet>
27-
<PlatformToolset>v120_xp</PlatformToolset>
27+
<PlatformToolset>v140_xp</PlatformToolset>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
3030
<ConfigurationType>StaticLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
3232
<CharacterSet>Unicode</CharacterSet>
33-
<PlatformToolset>v120_xp</PlatformToolset>
33+
<PlatformToolset>v140_xp</PlatformToolset>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>StaticLibrary</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
3838
<WholeProgramOptimization>true</WholeProgramOptimization>
3939
<CharacterSet>Unicode</CharacterSet>
40-
<PlatformToolset>v120_xp</PlatformToolset>
40+
<PlatformToolset>v140_xp</PlatformToolset>
4141
</PropertyGroup>
4242
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4343
<ImportGroup Label="ExtensionSettings">

‎PythonScript.Tests/gtest.proj/gtest.vcxproj.filters‎

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

‎PythonScript.Tests/packages.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="boost" version="1.66.0.0" targetFramework="native" />
4+
<package id="boost_python-vc140" version="1.66.0.0" targetFramework="native" />
5+
<package id="boost_regex-vc140" version="1.66.0.0" targetFramework="native" />
6+
</packages>

0 commit comments

Comments
 (0)