Skip to content

Commit ddc6941

Browse files
committed
- 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
1 parent 218f43f commit ddc6941

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

PythonScript.Tests/PythonScript.Tests.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
156156
<LinkIncremental>true</LinkIncremental>
157157
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
158-
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)</LibraryPath>
158+
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathARM64);$(LibraryPath)</LibraryPath>
159159
</PropertyGroup>
160160
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'">
161161
<LinkIncremental>true</LinkIncremental>
@@ -170,7 +170,7 @@
170170
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|ARM64'">
171171
<LinkIncremental>true</LinkIncremental>
172172
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
173-
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)</LibraryPath>
173+
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathARM64);$(LibraryPath)</LibraryPath>
174174
</PropertyGroup>
175175
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
176176
<LinkIncremental>false</LinkIncremental>
@@ -185,7 +185,7 @@
185185
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
186186
<LinkIncremental>false</LinkIncremental>
187187
<IncludePath>$(BoostBase);$(ProjectDir)..\PythonScript\res;$(ProjectDir)..\NppPlugin\include;$(PythonBase)\Include;$(PythonBase)\PC;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
188-
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathX64);$(LibraryPath)</LibraryPath>
188+
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPathARM64);$(LibraryPath)</LibraryPath>
189189
</PropertyGroup>
190190
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
191191
<ClCompile>
2.3 MB
Binary file not shown.
17.1 MB
Binary file not shown.

installer/PythonScript.wxs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
<?if $(var.Platform) = x64 ?>
55
<?define ProductName = "PythonScript plugin for Notepad++ (64 bit)" ?>
6+
<?elseif $(var.Platform) = arm64 ?>
7+
<?define ProductName = "PythonScript plugin for Notepad++ (arm64 bit)" ?>
68
<?else?>
79
<?define ProductName = "PythonScript plugin for Notepad++" ?>
810
<?endif?>

installer/buildInstaller.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ IF "%1"=="x64" SET INST_TEMP_DIR=temp64
2727
IF "%1"=="x64" SET NAME_ADDON=_x64
2828
IF "%1"=="x64" SET MSI_ARCH=x64
2929

30-
IF "%1"=="arm64" SET PYTHONBUILDDIR=%PYTHONBUILDDIR_ARM64%
31-
IF "%1"=="arm64" SET PYTHONSCRIPTDLLDIR=arm64
32-
IF "%1"=="arm64" SET INST_TEMP_DIR=temparm64
33-
IF "%1"=="arm64" SET NAME_ADDON=_arm64
34-
IF "%1"=="arm64" SET MSI_ARCH=arm64
30+
IF "%1"=="ARM64" SET PYTHONBUILDDIR=%PYTHONBUILDDIR_ARM64%
31+
IF "%1"=="ARM64" SET PYTHONSCRIPTDLLDIR=arm64
32+
IF "%1"=="ARM64" SET INST_TEMP_DIR=temparm64
33+
IF "%1"=="ARM64" SET NAME_ADDON=_arm64
34+
IF "%1"=="ARM64" SET MSI_ARCH=arm64
3535

3636
IF NOT EXIST "%PYTHONBUILDDIR%\python.exe" (
3737
echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python.exe. Please set PYTHONBUILDDIR to the root of a built Python 3.14

installer/buildReleaseZips.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ IF "%1"=="x64" SET PYTHONSCRIPTDLLDIR=x64
2424
IF "%1"=="x64" SET INST_TEMP_DIR=temp64
2525
IF "%1"=="x64" SET NAME_ADDON=_x64
2626

27-
IF "%1"=="arm64" SET PYTHONBUILDDIR=%PYTHONBUILDDIR_ARM64%
28-
IF "%1"=="arm64" SET PYTHONSCRIPTDLLDIR=arm64
29-
IF "%1"=="arm64" SET INST_TEMP_DIR=temparm64
30-
IF "%1"=="arm64" SET NAME_ADDON=_arm64
27+
IF "%1"=="ARM64" SET PYTHONBUILDDIR=%PYTHONBUILDDIR_ARM64%
28+
IF "%1"=="ARM64" SET PYTHONSCRIPTDLLDIR=arm64
29+
IF "%1"=="ARM64" SET INST_TEMP_DIR=temparm64
30+
IF "%1"=="ARM64" SET NAME_ADDON=_arm64
3131

3232
IF NOT EXIST "%PYTHONBUILDDIR%\python.exe" (
3333
echo Your PYTHONBUILDDIR in buildPaths.bat does not contain python.exe. Please set PYTHONBUILDDIR to the root of a built Python 3.14

0 commit comments

Comments
 (0)