Skip to content

Commit 0287d1a

Browse files
chcgchcg
authored
Arm64 with boost 1.90.0 and python 3.14.3 (#408)
- add boost directly, stripped for 1.90 headers needed - use python 3.14.3 - further adaptations for python312 -> python314 - avoid build installer issue: WixToolset.UI.wixext : warning WIX6101: Could not find expected package root folder wixext6. Ensure WixToolset.UI.wixext/7.0.0-rc.1 is compatible with WiX v6. Compiling PythonScript installer wix.exe : error WIX0144: The extension 'WixToolset.UI.wixext' could not be found. Checked paths: WixToolset.UI.wixext Error! - adapt installer config for arm64 - add libboost_python314-vc143-mt-s-a64-1_90.lib from https://github.com/chcg/boost-release-windows/actions/runs/22465173678 - always use python.exe from %PYTHONBUILDDIR_X64% to run python scripts on x86 - copyright 2025 - 2026 - avoid running arm64 test to avoid build issue on x86 windows debug build - avoid compiler warning ..\PythonScript\src\PythonHandler.cpp(318,18): warning C4996: '_Py_fopen_obj': deprecated in 3.14 - avoid compiler warning ..\PythonScript\PythonScript\src\UTF8Iterator.cpp(13,39): Siehe Deklaration von "string_type" ..\PythonScript\boost\boost\regex\v5\primary_transform.hpp(59,41): - avoid boost compiler warnings
1 parent eab21e1 commit 0287d1a

File tree

3,646 files changed

+566936
-88677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,646 files changed

+566936
-88677
lines changed

‎.github/workflows/CI_build.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ jobs:
77

88
runs-on: windows-latest
99
strategy:
10+
fail-fast: false
1011
matrix:
1112
build_configuration: [Release, Debug]
12-
build_platform: [x64, Win32]
13+
build_platform: [x64, Win32, ARM64]
1314

1415
steps:
1516
- name: Checkout repo
@@ -43,8 +44,9 @@ jobs:
4344
if: matrix.build_configuration == 'Release'
4445
working-directory: installer
4546
run: |
46-
$env:PYTHONBUILDDIR_X64='${{ github.workspace }}\packages\python.3.12.10\tools'
47-
$env:PYTHONBUILDDIR='${{ github.workspace }}\packages\pythonx86.3.12.10\tools'
47+
$env:PYTHONBUILDDIR_ARM64='${{ github.workspace }}\packages\pythonarm64.3.14.3\tools'
48+
$env:PYTHONBUILDDIR_X64='${{ github.workspace }}\packages\python.3.14.3\tools'
49+
$env:PYTHONBUILDDIR='${{ github.workspace }}\packages\pythonx86.3.14.3\tools'
4850
Rename-Item -Path ".\buildPaths.bat.orig" -NewName "buildPaths.bat"
49-
dotnet tool install --global wix
51+
dotnet tool install --global wix --version 6.0.2
5052
.\buildAll.bat ${{ matrix.build_platform }}

‎NppPlugin/project/NppPlugin.vcxproj‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM64</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
@@ -9,6 +13,10 @@
913
<Configuration>Debug</Configuration>
1014
<Platform>x64</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="PythonDebug|ARM64">
17+
<Configuration>PythonDebug</Configuration>
18+
<Platform>ARM64</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="PythonDebug|Win32">
1321
<Configuration>PythonDebug</Configuration>
1422
<Platform>Win32</Platform>
@@ -17,6 +25,10 @@
1725
<Configuration>PythonDebug</Configuration>
1826
<Platform>x64</Platform>
1927
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Release|ARM64">
29+
<Configuration>Release</Configuration>
30+
<Platform>ARM64</Platform>
31+
</ProjectConfiguration>
2032
<ProjectConfiguration Include="Release|Win32">
2133
<Configuration>Release</Configuration>
2234
<Platform>Win32</Platform>
@@ -45,6 +57,12 @@
4557
<WholeProgramOptimization>true</WholeProgramOptimization>
4658
<PlatformToolset>v143</PlatformToolset>
4759
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
61+
<ConfigurationType>StaticLibrary</ConfigurationType>
62+
<CharacterSet>Unicode</CharacterSet>
63+
<WholeProgramOptimization>true</WholeProgramOptimization>
64+
<PlatformToolset>v143</PlatformToolset>
65+
</PropertyGroup>
4866
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4967
<ConfigurationType>StaticLibrary</ConfigurationType>
5068
<CharacterSet>Unicode</CharacterSet>
@@ -55,6 +73,11 @@
5573
<CharacterSet>Unicode</CharacterSet>
5674
<PlatformToolset>v143</PlatformToolset>
5775
</PropertyGroup>
76+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
77+
<ConfigurationType>StaticLibrary</ConfigurationType>
78+
<CharacterSet>Unicode</CharacterSet>
79+
<PlatformToolset>v143</PlatformToolset>
80+
</PropertyGroup>
5881
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
5982
<ConfigurationType>StaticLibrary</ConfigurationType>
6083
<CharacterSet>Unicode</CharacterSet>
@@ -65,6 +88,11 @@
6588
<CharacterSet>Unicode</CharacterSet>
6689
<PlatformToolset>v143</PlatformToolset>
6790
</PropertyGroup>
91+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'" Label="Configuration">
92+
<ConfigurationType>StaticLibrary</ConfigurationType>
93+
<CharacterSet>Unicode</CharacterSet>
94+
<PlatformToolset>v143</PlatformToolset>
95+
</PropertyGroup>
6896
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6997
<ImportGroup Label="ExtensionSettings">
7098
</ImportGroup>
@@ -74,18 +102,27 @@
74102
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
75103
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
76104
</ImportGroup>
105+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
106+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
107+
</ImportGroup>
77108
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
78109
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
79110
</ImportGroup>
80111
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
81112
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
82113
</ImportGroup>
114+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
115+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
116+
</ImportGroup>
83117
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="PropertySheets">
84118
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
85119
</ImportGroup>
86120
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="PropertySheets">
87121
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
88122
</ImportGroup>
123+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'" Label="PropertySheets">
124+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
125+
</ImportGroup>
89126
<PropertyGroup Label="UserMacros" />
90127
<PropertyGroup>
91128
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -98,12 +135,18 @@
98135
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)\..\bin64\$(Configuration)\</OutDir>
99136
<OutDir Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'">$(ProjectDir)\..\bin64\$(Configuration)\</OutDir>
100137
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)\..\bin64\$(Configuration)\</OutDir>
138+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(ProjectDir)\..\binarm64\$(Configuration)\</OutDir>
139+
<OutDir Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">$(ProjectDir)\..\binarm64\$(Configuration)\</OutDir>
140+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(ProjectDir)\..\binarm64\$(Configuration)\</OutDir>
101141
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath)</IncludePath>
102142
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath)</IncludePath>
143+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(IncludePath)</IncludePath>
103144
<IncludePath Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">$(IncludePath)</IncludePath>
104145
<IncludePath Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'">$(IncludePath)</IncludePath>
146+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">$(IncludePath)</IncludePath>
105147
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>
106148
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath)</IncludePath>
149+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(IncludePath)</IncludePath>
107150
</PropertyGroup>
108151
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
109152
<ClCompile>
@@ -135,6 +178,21 @@
135178
<LanguageStandard_C>stdc17</LanguageStandard_C>
136179
</ClCompile>
137180
</ItemDefinitionGroup>
181+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
182+
<ClCompile>
183+
<Optimization>Disabled</Optimization>
184+
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
185+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
187+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
188+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
189+
<WarningLevel>Level4</WarningLevel>
190+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
191+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
192+
<LanguageStandard>stdcpp17</LanguageStandard>
193+
<LanguageStandard_C>stdc17</LanguageStandard_C>
194+
</ClCompile>
195+
</ItemDefinitionGroup>
138196
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
139197
<ClCompile>
140198
<Optimization>Disabled</Optimization>
@@ -165,6 +223,21 @@
165223
<LanguageStandard_C>stdc17</LanguageStandard_C>
166224
</ClCompile>
167225
</ItemDefinitionGroup>
226+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">
227+
<ClCompile>
228+
<Optimization>Disabled</Optimization>
229+
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
230+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
231+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
232+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
233+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
234+
<WarningLevel>Level4</WarningLevel>
235+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
236+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
237+
<LanguageStandard>stdcpp17</LanguageStandard>
238+
<LanguageStandard_C>stdc17</LanguageStandard_C>
239+
</ClCompile>
240+
</ItemDefinitionGroup>
168241
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
169242
<ClCompile>
170243
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -191,17 +264,33 @@
191264
<LanguageStandard_C>stdc17</LanguageStandard_C>
192265
</ClCompile>
193266
</ItemDefinitionGroup>
267+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
268+
<ClCompile>
269+
<AdditionalIncludeDirectories>..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
270+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
271+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
272+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
273+
<WarningLevel>Level3</WarningLevel>
274+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
275+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
276+
<LanguageStandard>stdcpp17</LanguageStandard>
277+
<LanguageStandard_C>stdc17</LanguageStandard_C>
278+
</ClCompile>
279+
</ItemDefinitionGroup>
194280
<ItemGroup>
195281
<ClCompile Include="..\src\dpiManagerV2.cpp" />
196282
<ClCompile Include="..\src\NppDarkModeDummy.cpp" />
197283
<ClCompile Include="..\src\StaticDialog.cpp" />
198284
<ClCompile Include="..\stdafx.cpp">
199285
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
200286
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
287+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
201288
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
202289
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
290+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
203291
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">Create</PrecompiledHeader>
204292
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'">Create</PrecompiledHeader>
293+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">Create</PrecompiledHeader>
205294
</ClCompile>
206295
</ItemGroup>
207296
<ItemGroup>

0 commit comments

Comments
 (0)