From 9391fa764fabfe02e5a8355bae585b0d3611da4c Mon Sep 17 00:00:00 2001 From: Don HO Date: Sun, 20 May 2018 03:05:06 +0200 Subject: [PATCH] Enhance Notepad++ installation packaging Use GUP to retrieve GUP release from its website while doing Notepad++ release. --- .gitignore | 4 +++- PowerEditor/installer/packageAll.bat | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3695f51be..faf1be9b3 100644 --- a/.gitignore +++ b/.gitignore @@ -66,9 +66,11 @@ PowerEditor/bin/session.xml PowerEditor/bin/functionList.xml PowerEditor/bin/shortcuts.xml PowerEditor/bin/backup/ -PowerEditor/bin/localization +PowerEditor/bin/localization/ PowerEditor/bin/plugins/ +PowerEditor/bin/updater/ PowerEditor/bin64/ +PowerEditor/installer/bin/wingup/ PowerEditor/installer/build/ PowerEditor/installer/minimalist/ PowerEditor/installer/minimalist64/ diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 5fbc235a4..44216a6c1 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -17,8 +17,19 @@ rem along with this program; if not, write to the Free Software rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. echo on - if %SIGN% == 0 goto NoSign + +rem retrieve GUP release from website while doing Notepad++ release +set WINGUP_VER=5.0.1 +IF EXIST ".\bin\wingup\GUP.exe" ( + cd .\bin\wingup + GUP.exe -unzipTo %~dp0\..\bin\updater https://github.com/notepad-plus-plus/wingup/releases/download/v%WINGUP_VER%/wingup.v%WINGUP_VER%.bin.zip + GUP.exe -unzipTo %~dp0\..\bin64\updater https://github.com/notepad-plus-plus/wingup/releases/download/v%WINGUP_VER%/wingup.v%WINGUP_VER%.bin.x64.zip + cd ..\.. +) ELSE ( + echo .\wingup\GUP.exe is absent. +) + signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin\notepad++.exe If ErrorLevel 1 goto End signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\notepad++.exe