Skip to content

Commit efd45bb

Browse files
chcgchcg
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 - use always python.exe from %PYTHONBUILDDIR_X64% to run python scripts on x86
1 parent 218f43f commit efd45bb

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
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>

‎boost/lib/libboost_python314-vc143-mt-s-a64-1_90.lib‎

2.3 MB
Binary file not shown.

‎boost/lib/libboost_python314-vc143-mt-sgd-a64-1_90.lib‎

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: 6 additions & 6 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
@@ -45,7 +45,7 @@ IF NOT EXIST "%PYTHONBUILDDIR%\python314.dll" (
4545

4646
mkdir %INST_TEMP_DIR%
4747

48-
%PYTHONBUILDDIR%\python extractVersion.py > %INST_TEMP_DIR%\version.txt
48+
%PYTHONBUILDDIR_X64%\python extractVersion.py > %INST_TEMP_DIR%\version.txt
4949
SET /p PYTHONSCRIPTVERSION= < %INST_TEMP_DIR%\version.txt
5050

5151

‎installer/buildReleaseZips.bat‎

Lines changed: 13 additions & 13 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
@@ -59,7 +59,7 @@ IF NOT [%ERRORLEVEL%]==[0] (
5959

6060

6161

62-
%PYTHONBUILDDIR%\python extractVersion.py > %INST_TEMP_DIR%\version.txt
62+
%PYTHONBUILDDIR_X64%\python extractVersion.py > %INST_TEMP_DIR%\version.txt
6363
SET /p PYTHONSCRIPTVERSION= < %INST_TEMP_DIR%\version.txt
6464

6565
echo Building Release for version %PYTHONSCRIPTVERSION%
@@ -128,39 +128,39 @@ echo Here are the local server links if you can't get to ^<a href="http://source
128128
echo Please use the sourceforge link if you can - I have limited bandwidth limits. >> %INSTALLERDIR%\..\www\localdl.shtml
129129
echo ^<br/^>^<br/^>^<br/^> >> %INSTALLERDIR%\..\www\localdl.shtml
130130

131-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
131+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
132132
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
133133

134134
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_%PYTHONSCRIPTVERSION%%NAME_ADDON%.msi"^>Python Script %PYTHONSCRIPTVERSION% Installer (includes all extra files) (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
135135

136-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
136+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
137137
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
138138
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z"^>Python Script %PYTHONSCRIPTVERSION% FULL 7zip version (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
139139

140-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
140+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
141141
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
142142
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_Full_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip"^>Python Script %PYTHONSCRIPTVERSION% FULL zip version (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
143143

144-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
144+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
145145
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
146146
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z"^>Python Script %PYTHONSCRIPTVERSION% MINIMUM 7zip version (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
147147

148-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
148+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
149149
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
150150
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_Min_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip"^>Python Script %PYTHONSCRIPTVERSION% MINIMUM zip version (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
151151

152-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
152+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
153153
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
154154
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.7z"^>Tcl/Tk libraries 7z (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
155155

156-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
156+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\humanReadableSize.py %INSTALLERDIR%\build\%PYTHONSCRIPTVERSION%\PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip > %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
157157
SET /p PYTHONSCRIPT_FILESIZE= < %INSTALLERDIR%\%INST_TEMP_DIR%\size.txt
158158
echo ^<br/^>^<a href="http://www.brotherstone.co.uk/npp/ps/downloads/%PYTHONSCRIPTVERSION%/PythonScript_TclTk_%PYTHONSCRIPTVERSION%%NAME_ADDON%.zip"^>Tcl/Tk libraries zip (%PYTHONSCRIPT_FILESIZE%)^</a^> >> %INSTALLERDIR%\..\www\localdl.shtml
159159

160160
echo ^<!--#include virtual="footer.inc" --^> >> %INSTALLERDIR%\..\www\localdl.shtml
161161

162162
echo Updating "Latest Version" in header.inc
163-
%PYTHONBUILDDIR%\python %INSTALLERDIR%\updateLatestVersion.py %INSTALLERDIR%\..\www\header.inc %PYTHONSCRIPTVERSION%
163+
%PYTHONBUILDDIR_X64%\python %INSTALLERDIR%\updateLatestVersion.py %INSTALLERDIR%\..\www\header.inc %PYTHONSCRIPTVERSION%
164164

165165

166166
CD /d %ORIGINALDIR%

0 commit comments

Comments
 (0)