Skip to content

Commit f6bc1df

Browse files
chcgchcg
committed
test build with boost via vcpkg
1 parent 80460a0 commit f6bc1df

7 files changed

Lines changed: 88 additions & 33 deletions

File tree

‎.github/workflows/CI_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: MSBuild of solution
3232
working-directory: .
33-
run: msbuild PythonScript.sln /m /verbosity:minimal /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}"
33+
run: msbuild PythonScript.sln /m /verbosity:minimal /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:VcpkgEnableManifest=true
3434

3535
- name: Build docs
3636
if: matrix.build_configuration == 'Release'

‎NppPlugin/project/NppPlugin.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186186
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
187187
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
188-
<PrecompiledHeader>Use</PrecompiledHeader>
188+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
189189
<WarningLevel>Level4</WarningLevel>
190190
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
191191
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -230,7 +230,7 @@
230230
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
231231
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
232232
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
233-
<PrecompiledHeader>Use</PrecompiledHeader>
233+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
234234
<WarningLevel>Level4</WarningLevel>
235235
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
236236
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -269,7 +269,7 @@
269269
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
270270
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
271271
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
272-
<PrecompiledHeader>Use</PrecompiledHeader>
272+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
273273
<WarningLevel>Level3</WarningLevel>
274274
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
275275
<MultiProcessorCompilation>true</MultiProcessorCompilation>

‎PythonScript.Tests/PythonScript.Tests.vcxproj‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,36 @@
187187
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
188188
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)</LibraryPath>
189189
</PropertyGroup>
190+
<PropertyGroup Label="Vcpkg">
191+
<VcpkgEnableManifest>true</VcpkgEnableManifest>
192+
</PropertyGroup>
193+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
194+
<VcpkgUseStatic>true</VcpkgUseStatic>
195+
</PropertyGroup>
196+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">
197+
<VcpkgUseStatic>true</VcpkgUseStatic>
198+
</PropertyGroup>
199+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
200+
<VcpkgUseStatic>true</VcpkgUseStatic>
201+
</PropertyGroup>
202+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
203+
<VcpkgUseStatic>true</VcpkgUseStatic>
204+
</PropertyGroup>
205+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
206+
<VcpkgUseStatic>true</VcpkgUseStatic>
207+
</PropertyGroup>
208+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
209+
<VcpkgUseStatic>true</VcpkgUseStatic>
210+
</PropertyGroup>
211+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
212+
<VcpkgUseStatic>true</VcpkgUseStatic>
213+
</PropertyGroup>
214+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'">
215+
<VcpkgUseStatic>true</VcpkgUseStatic>
216+
</PropertyGroup>
217+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
218+
<VcpkgUseStatic>true</VcpkgUseStatic>
219+
</PropertyGroup>
190220
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
191221
<ClCompile>
192222
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -446,15 +476,4 @@
446476
<ClCompile Include="tests\TestReplacer.cpp" />
447477
</ItemGroup>
448478
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
449-
<ImportGroup Label="ExtensionTargets">
450-
<Import Project="..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\packages\boost.1.87.0\build\boost.targets')" />
451-
<Import Project="..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets" Condition="Exists('..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets')" />
452-
</ImportGroup>
453-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
454-
<PropertyGroup>
455-
<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>
456-
</PropertyGroup>
457-
<Error Condition="!Exists('..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.87.0\build\boost.targets'))" />
458-
<Error Condition="!Exists('..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets'))" />
459-
</Target>
460479
</Project>

‎PythonScript.Tests/packages.config‎

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

‎PythonScript/project/PythonScript.vcxproj‎

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,45 @@
252252
<IncludePath>$(BoostBase);$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(PythonBase)\PC;$(IncludePath)</IncludePath>
253253
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathARM64);$(ProjectDir)..\..\NppPlugin\binarm64\release;$(LibraryPath)</LibraryPath>
254254
</PropertyGroup>
255+
<PropertyGroup Label="Vcpkg">
256+
<VcpkgEnableManifest>true</VcpkgEnableManifest>
257+
</PropertyGroup>
258+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
259+
<VcpkgUseStatic>true</VcpkgUseStatic>
260+
</PropertyGroup>
261+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
262+
<VcpkgUseStatic>true</VcpkgUseStatic>
263+
</PropertyGroup>
264+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='DebugStartup|ARM64'">
265+
<VcpkgUseStatic>true</VcpkgUseStatic>
266+
</PropertyGroup>
267+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">
268+
<VcpkgUseStatic>true</VcpkgUseStatic>
269+
</PropertyGroup>
270+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
271+
<VcpkgUseStatic>true</VcpkgUseStatic>
272+
</PropertyGroup>
273+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
274+
<VcpkgUseStatic>true</VcpkgUseStatic>
275+
</PropertyGroup>
276+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='DebugStartup|Win32'">
277+
<VcpkgUseStatic>true</VcpkgUseStatic>
278+
</PropertyGroup>
279+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
280+
<VcpkgUseStatic>true</VcpkgUseStatic>
281+
</PropertyGroup>
282+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
283+
<VcpkgUseStatic>true</VcpkgUseStatic>
284+
</PropertyGroup>
285+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
286+
<VcpkgUseStatic>true</VcpkgUseStatic>
287+
</PropertyGroup>
288+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='DebugStartup|x64'">
289+
<VcpkgUseStatic>true</VcpkgUseStatic>
290+
</PropertyGroup>
291+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'">
292+
<VcpkgUseStatic>true</VcpkgUseStatic>
293+
</PropertyGroup>
255294
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
256295
<ClCompile>
257296
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -722,15 +761,4 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
722761
<ResourceCompile Include="..\res\PythonScriptVersion.rc" />
723762
</ItemGroup>
724763
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
725-
<ImportGroup Label="ExtensionTargets">
726-
<Import Project="..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.87.0\build\boost.targets')" />
727-
<Import Project="..\..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets" Condition="Exists('..\..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets')" />
728-
</ImportGroup>
729-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
730-
<PropertyGroup>
731-
<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>
732-
</PropertyGroup>
733-
<Error Condition="!Exists('..\..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.87.0\build\boost.targets'))" />
734-
<Error Condition="!Exists('..\..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost_python312-vc143.1.87.0\build\boost_python312-vc143.targets'))" />
735-
</Target>
736764
</Project>

‎PythonScript/project/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="WixToolset.UI.wixext" version="6.0.2" targetFramework="native" />
4-
<package id="boost" version="1.87.0" targetFramework="native" />
5-
<package id="boost_python312-vc143" version="1.87.0" targetFramework="native" />
64
<package id="python" version="3.12.10" targetFramework="native" />
75
<package id="pythonx86" version="3.12.10" targetFramework="native" />
86
<package id="pythonarm64" version="3.12.10" targetFramework="native" />

‎vcpkg.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "npp-pythonscript",
3+
"version": "0.0.1",
4+
"builtin-baseline": "544a4c5c297e60e4ac4a5a1810df66748d908869",
5+
"dependencies": [
6+
{
7+
"name": "boost-headers",
8+
"version>=": "1.90.0"
9+
},
10+
{
11+
"name": "boost-python",
12+
"version>=": "1.90.0"
13+
}
14+
]
15+
}

0 commit comments

Comments
 (0)