Skip to content

Commit 36856dd

Browse files
committed
Make packaging script impact
1 parent d3bb31b commit 36856dd

File tree

2 files changed

+9
-46
lines changed

2 files changed

+9
-46
lines changed

PowerEditor/installer/nppSetup.nsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ OutFile ".\build\npp.${APPVERSION}.Installer.arm64.exe"
4545
OutFile ".\build\npp.${APPVERSION}.Installer.exe"
4646
!endif
4747

48-
; Sign both installer and uninstaller
49-
!finalize 'sign-installers.bat "%1"' = 0 ; %1 is replaced by the installer exe to be signed.
48+
; Sign uninstaller
5049
!uninstfinalize 'sign-installers.bat "%1"' = 0 ; %1 is replaced by the uninstaller exe to be signed.
5150

5251
; ------------------------------------------------------------------------

PowerEditor/installer/packageAll.bat

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ REM https://learn.microsoft.com/en-us/windows/msix/package/signing-known-issues
2727
set signBinarySha256=%signtoolWin11% sign /fd SHA256 /tr http://timestamp.acs.microsoft.com /td sha512 /a /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/
2828

2929

30-
%signBinary% ..\bin\notepad++.exe
31-
If ErrorLevel 1 goto End
32-
%signBinary% ..\bin64\notepad++.exe
33-
If ErrorLevel 1 goto End
34-
%signBinary% ..\binarm64\notepad++.exe
30+
set baseBinaries=..\bin\notepad++.exe ..\bin64\notepad++.exe ..\binarm64\notepad++.exe ..\bin\plugins\Config\nppPluginList.dll ..\bin64\plugins\Config\nppPluginList.dll ..\binarm64\plugins\Config\nppPluginList.dll ..\bin\updater\GUP.exe ..\bin64\updater\GUP.exe ..\binarm64\updater\GUP.exe ..\bin\updater\libcurl.dll ..\bin64\updater\libcurl.dll ..\binarm64\updater\libcurl.dll ..\bin\plugins\NppExport\NppExport.dll ..\bin64\plugins\NppExport\NppExport.dll ..\binarm64\plugins\NppExport\NppExport.dll ..\bin\plugins\mimeTools\mimeTools.dll ..\bin64\plugins\mimeTools\mimeTools.dll ..\binarm64\plugins\mimeTools\mimeTools.dll ..\bin\plugins\NppConverter\NppConverter.dll ..\bin64\plugins\NppConverter\NppConverter.dll ..\binarm64\plugins\NppConverter\NppConverter.dll
31+
32+
%signBinary% %baseBinaries%
3533
If ErrorLevel 1 goto End
3634

35+
3736
REM %signBinarySha256% ..\bin\NppShell.x86.dll
3837
REM If ErrorLevel 1 goto End
3938
REM
@@ -47,47 +46,8 @@ REM If ErrorLevel 1 goto End
4746
REM %signBinarySha256% ..\binarm64\NppShell.arm64.dll
4847
REM If ErrorLevel 1 goto End
4948

50-
%signBinary% ..\bin\plugins\Config\nppPluginList.dll
51-
If ErrorLevel 1 goto End
52-
%signBinary% ..\bin64\plugins\Config\nppPluginList.dll
53-
If ErrorLevel 1 goto End
54-
%signBinary% ..\binarm64\plugins\Config\nppPluginList.dll
55-
If ErrorLevel 1 goto End
56-
57-
%signBinary% ..\bin\updater\GUP.exe
58-
If ErrorLevel 1 goto End
59-
%signBinary% ..\bin64\updater\GUP.exe
60-
If ErrorLevel 1 goto End
61-
%signBinary% ..\binarm64\updater\GUP.exe
62-
If ErrorLevel 1 goto End
63-
64-
%signBinary% ..\bin\updater\libcurl.dll
65-
If ErrorLevel 1 goto End
66-
%signBinary% ..\bin64\updater\libcurl.dll
67-
If ErrorLevel 1 goto End
68-
%signBinary% ..\binarm64\updater\libcurl.dll
69-
If ErrorLevel 1 goto End
70-
71-
%signBinary% ..\bin\plugins\NppExport\NppExport.dll
72-
If ErrorLevel 1 goto End
73-
%signBinary% ..\bin64\plugins\NppExport\NppExport.dll
74-
If ErrorLevel 1 goto End
75-
%signBinary% ..\binarm64\plugins\NppExport\NppExport.dll
76-
If ErrorLevel 1 goto End
7749

78-
%signBinary% ..\bin\plugins\mimeTools\mimeTools.dll
79-
If ErrorLevel 1 goto End
80-
%signBinary% ..\bin64\plugins\mimeTools\mimeTools.dll
81-
If ErrorLevel 1 goto End
82-
%signBinary% ..\binarm64\plugins\mimeTools\mimeTools.dll
83-
If ErrorLevel 1 goto End
8450

85-
%signBinary% ..\bin\plugins\NppConverter\NppConverter.dll
86-
If ErrorLevel 1 goto End
87-
%signBinary% ..\bin64\plugins\NppConverter\NppConverter.dll
88-
If ErrorLevel 1 goto End
89-
%signBinary% ..\binarm64\plugins\NppConverter\NppConverter.dll
90-
If ErrorLevel 1 goto End
9151

9252
:NoSign
9353

@@ -545,6 +505,10 @@ ren npp.portable.minimalist.7z !7zvarMin!
545505
ren npp.portable.minimalist.x64.7z !7zvarMin64!
546506
ren npp.portable.minimalist.arm64.7z !7zvarMinArm64!
547507

508+
if %SIGN% == 0 goto NoSignInstaller
509+
%signBinary% !nppInstallerVar! !nppInstallerVar64! !nppInstallerVarArm64!
510+
511+
:NoSignInstaller
548512

549513
cd ..
550514

0 commit comments

Comments
 (0)