Skip to content

Commit b34b5b1

Browse files
committed
Remove libcurl.dll
1 parent 6493d5c commit b34b5b1

3 files changed

Lines changed: 6 additions & 15 deletions

File tree

PowerEditor/installer/msi/wingup.wxs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<Component Id="gup_exe">
88
<File Source="..\..\bin64\updater\GUP.exe" KeyPath="yes" />
99
</Component>
10-
<Component Id="libcurl_dll">
11-
<File Source="..\..\bin64\updater\libcurl.dll" KeyPath="yes" />
12-
</Component>
1310
<Component Id="updater_ico">
1411
<File Source="..\..\bin64\updater\updater.ico" KeyPath="yes" />
1512
</Component>

PowerEditor/installer/nsisInclude/binariesComponents.nsh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,18 @@ ${MementoSection} "Auto-Updater" AutoUpdater
7474
SetOutPath "$INSTDIR\updater"
7575
!ifdef ARCH64
7676
File "..\bin64\updater\GUP.exe"
77-
File "..\bin64\updater\libcurl.dll"
7877
File "..\bin64\updater\gup.xml"
7978
File "..\bin64\updater\LICENSE"
8079
File "..\bin64\updater\README.md"
8180
File "..\bin64\updater\updater.ico"
8281
!else ifdef ARCHARM64
8382
File "..\binarm64\updater\GUP.exe"
84-
File "..\binarm64\updater\libcurl.dll"
8583
File "..\binarm64\updater\gup.xml"
8684
File "..\binarm64\updater\LICENSE"
8785
File "..\binarm64\updater\README.md"
8886
File "..\binarm64\updater\updater.ico"
8987
!else
9088
File "..\bin\updater\GUP.exe"
91-
File "..\bin\updater\libcurl.dll"
9289
File "..\bin\updater\gup.xml"
9390
File "..\bin\updater\LICENSE"
9491
File "..\bin\updater\README.md"

PowerEditor/installer/packageAll.bat

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ REM files to be signed
3131

3232
set nppBinaries=..\bin\notepad++.exe ..\bin64\notepad++.exe ..\binarm64\notepad++.exe
3333

34-
set componentsBinaries=..\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
34+
set componentsBinaries=..\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
3535

3636
set pluginBinaries=..\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
3737

@@ -379,8 +379,6 @@ copy /Y ..\bin\plugins\Config\nppPluginList.dll .\zipped.package.release\plugins
379379
If ErrorLevel 1 goto End
380380
copy /Y ..\bin\updater\GUP.exe .\zipped.package.release\updater\
381381
If ErrorLevel 1 goto End
382-
copy /Y ..\bin\updater\libcurl.dll .\zipped.package.release\updater\
383-
If ErrorLevel 1 goto End
384382
copy /Y ..\bin\updater\gup.xml .\zipped.package.release\updater\
385383
If ErrorLevel 1 goto End
386384
copy /Y ..\bin\updater\LICENSE .\zipped.package.release\updater\
@@ -397,8 +395,6 @@ copy /Y ..\bin64\plugins\Config\nppPluginList.dll .\zipped.package.release64\plu
397395
If ErrorLevel 1 goto End
398396
copy /Y ..\bin64\updater\GUP.exe .\zipped.package.release64\updater\
399397
If ErrorLevel 1 goto End
400-
copy /Y ..\bin64\updater\libcurl.dll .\zipped.package.release64\updater\
401-
If ErrorLevel 1 goto End
402398
copy /Y ..\bin64\updater\gup.xml .\zipped.package.release64\updater\
403399
If ErrorLevel 1 goto End
404400
copy /Y ..\bin64\updater\LICENSE .\zipped.package.release64\updater\
@@ -415,8 +411,6 @@ copy /Y ..\binarm64\plugins\Config\nppPluginList.dll .\zipped.package.releaseArm
415411
If ErrorLevel 1 goto End
416412
copy /Y ..\binarm64\updater\GUP.exe .\zipped.package.releaseArm64\updater\
417413
If ErrorLevel 1 goto End
418-
copy /Y ..\binarm64\updater\libcurl.dll .\zipped.package.releaseArm64\updater\
419-
If ErrorLevel 1 goto End
420414
copy /Y ..\binarm64\updater\gup.xml .\zipped.package.releaseArm64\updater\
421415
If ErrorLevel 1 goto End
422416
copy /Y ..\binarm64\updater\LICENSE .\zipped.package.releaseArm64\updater\
@@ -465,9 +459,12 @@ If ErrorLevel 1 goto End
465459
rem set var locally in this batch file
466460
setlocal
467461

462+
cd build
463+
468464
:: Get npp.6.9.Installer.exe in %nppInstallerVar%
469465
for %%f in (npp.*.Installer.exe) do set "nppInstallerVar=%%f"
470466

467+
471468
rem get the version string "6.9" in %VERSION%
472469
set "VERSION=%nppInstallerVar:npp.=%"
473470
rem replace "npp." with nothing in "npp.6.9.Installer.exe" - now VERSION is "6.9.Installer.exe"
@@ -479,7 +476,7 @@ rem replace ".Installer.exe" with nothing in "6.9.Installer.exe" - now VERSION i
479476

480477
rem echo %VERSION%
481478

482-
cd .\msi\
479+
cd ..\msi\
483480
dotnet build -c release -p:OutputPath=..\build\ -p:DefineConstants=Version=%VERSION%
484481
If ErrorLevel 1 goto End
485482

@@ -525,6 +522,6 @@ If ErrorLevel 1 goto End
525522

526523
endlocal
527524

528-
cd ..
525+
REM PACKACKAGES BUILT SUCCESSFUL!
529526

530527
:End

0 commit comments

Comments
 (0)