From 79028b33414aea84543f65b8bdc7b7475e5b34d9 Mon Sep 17 00:00:00 2001 From: Don HO Date: Tue, 12 Jul 2016 09:19:56 +0200 Subject: [PATCH] Appveyor artifacts debug and release for x86 & x64 Fixes #1942 Closes #2079 --- .gitignore | 2 +- PowerEditor/installer/packageAll.bat | 66 ++++++++++++++++++++++++++++ appveyor-build.cmd | 11 ----- appveyor.yml | 52 +++++++++++++++++++--- 4 files changed, 113 insertions(+), 18 deletions(-) delete mode 100644 appveyor-build.cmd diff --git a/.gitignore b/.gitignore index 02244742e..04e8c7e74 100644 --- a/.gitignore +++ b/.gitignore @@ -72,13 +72,13 @@ PowerEditor/bin64/ PowerEditor/installer/build/ PowerEditor/installer/minimalist/ PowerEditor/installer/zipped.package.release/ +PowerEditor/installer/zipped.package.release64/ PowerEditor/visual.net/Unicode Debug/ PowerEditor/visual.net/Unicode Release/ PowerEditor/visual.net/notepadPlus.sln PowerEditor/visual.net/x64/Unicode Debug/ PowerEditor/visual.net/x64/Unicode Release/ - # scintilla - generated files scintilla/bin/SciLexer.* scintilla/bin/Scintilla.* diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 9abb5582c..c7716ef25 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -18,14 +18,18 @@ rem Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. echo on +if %SIGN% == 0 goto NoSign 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 +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 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/ ..\bin\SciLexer.dll +signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\SciLexer.dll 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/ ..\bin\NppShell_06.dll 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/ ..\bin\NppShell64_06.dll +signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\NppShell64_06.dll If ErrorLevel 1 goto End sign them manuelly as they are updated @@ -39,12 +43,15 @@ 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/ ..\bin\plugins\NppExport.dll 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/ ..\bin\plugins\mimeTools.dll +signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\mimeTools.dll 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/ ..\bin\plugins\NppConverter.dll +signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ ..\bin64\plugins\NppConverter.dll 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/ ..\bin\plugins\PluginManager.dll If ErrorLevel 1 goto End +:NoSign rmdir /S /Q .\build @@ -126,6 +133,12 @@ If ErrorLevel 1 goto End copy /Y "..\bin\plugins\NppConverter.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 goto End +copy /Y "..\bin64\plugins\mimeTools.dll" .\zipped.package.release64\plugins\ +If ErrorLevel 1 goto End +copy /Y "..\bin64\plugins\NppConverter.dll" .\zipped.package.release64\plugins\ +If ErrorLevel 1 goto End + + rem plugins manager and its updater copy /Y "..\bin\plugins\PluginManager.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 goto End @@ -136,14 +149,20 @@ If ErrorLevel 1 goto End rem localizations copy /Y ".\nativeLang\*.xml" .\zipped.package.release\localization\ If ErrorLevel 1 goto End +copy /Y ".\nativeLang\*.xml" .\zipped.package.release64\localization\ +If ErrorLevel 1 goto End rem files API copy /Y ".\APIs\*.xml" .\zipped.package.release\plugins\APIs\ If ErrorLevel 1 goto End +copy /Y ".\APIs\*.xml" .\zipped.package.release64\plugins\APIs\ +If ErrorLevel 1 goto End rem theme copy /Y ".\themes\*.xml" .\zipped.package.release\themes\ If ErrorLevel 1 goto End +copy /Y ".\themes\*.xml" .\zipped.package.release64\themes\ +If ErrorLevel 1 goto End @@ -156,6 +175,47 @@ If ErrorLevel 1 goto End If ErrorLevel 1 goto End IF EXIST "%PROGRAMFILES(X86)%" ("%PROGRAMFILES(x86)%\NSIS\Unicode\makensis.exe" nppSetup.nsi) ELSE ("%PROGRAMFILES%\NSIS\Unicode\makensis.exe" nppSetup.nsi) +rem Notepad++ Unicode package +rmdir /S /Q .\zipped.package.release + +mkdir .\zipped.package.release64 +rem mkdir .\zipped.package.release64\updater +mkdir .\zipped.package.release64\localization +mkdir .\zipped.package.release64\themes +mkdir .\zipped.package.release64\plugins +mkdir .\zipped.package.release64\plugins\APIs +mkdir .\zipped.package.release64\plugins\Config +mkdir .\zipped.package.release64\plugins\doc + +copy /Y ..\bin\license.txt .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\bin\readme.txt .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\bin\change.log .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\src\config.model.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\src\langs.model.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\src\stylers.model.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\src\contextMenu.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\src\shortcuts.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\src\functionList.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\bin\doLocalConf.xml .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\bin64\"notepad++.exe" .\zipped.package.release64\ +If ErrorLevel 1 goto End +copy /Y ..\bin64\SciLexer.dll .\zipped.package.release64\ +If ErrorLevel 1 goto End + +"C:\Program Files\7-Zip\7z.exe" a -tzip -r .\build\npp.bin64.zip .\zipped.package.release64\* +If ErrorLevel 1 goto End + + @echo off @@ -167,14 +227,20 @@ for %%a in (npp.*.Installer.exe) do ( rem echo a = %%a set nppInstallerVar=%%a set zipvar=!nppInstallerVar:Installer.exe=bin.zip! + set 64zipvar=!nppInstallerVar:Installer.exe=bin64.zip! set 7zvar=!nppInstallerVar:Installer.exe=bin.7z! set 7zvarMin=!nppInstallerVar:Installer.exe=bin.minimalist.7z! ) + +rem echo z=!zipvar! ren npp.bin.zip !zipvar! +ren npp.bin64.zip !64zipvar! ren npp.bin.7z !7zvar! ren npp.bin.minimalist.7z !7zvarMin! +if %SIGN% == 0 goto NoSignInstaller signtool.exe sign /f %NPP_CERT% /p %NPP_CERT_PWD% /d "Notepad++ Installer" /du https://notepad-plus-plus.org/ /t http://timestamp.digicert.com/ !nppInstallerVar! +:NoSignInstaller cd .. diff --git a/appveyor-build.cmd b/appveyor-build.cmd deleted file mode 100644 index 3c3fddced..000000000 --- a/appveyor-build.cmd +++ /dev/null @@ -1,11 +0,0 @@ -@echo off - -cd scintilla\boostregex || exit -buildboost.bat C:\projects\notepad-plus-plus\boost_1_55_0 || exit -cd ..\win32 || exit -nmake -f scintilla.mak || exit -cd ..\..\PowerEditor\visual.net || exit -msbuild notepadPlus.vcxproj /p:configuration="Unicode Debug" /p:platform=Win32 || exit - -cd .. -appveyor PushArtifact bin diff --git a/appveyor.yml b/appveyor.yml index fdcbfc444..542827588 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,52 @@ +version: 1.0.{build} +image: Visual Studio 2013 + + clone_depth: 1 +platform: + - x64 + - Win32 + +configuration: + - Unicode Release + - Unicode Debug + install: - - ps: Invoke-WebRequest -OutFile boost_1_55_0.7z -UserAgent Wget/1.17.1 https://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.7z - - 7z x boost_1_55_0.7z 2>nul >nul + - if "%platform%"=="x64" set archi=amd64 + - if "%platform%"=="Win32" set archi=x86 + - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %archi% + +build: + verbosity: minimal build_script: - - cmd /k "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat" < appveyor-build.cmd + - cd c:\projects\notepad-plus-plus\scintilla\win32 + - if "%configuration%"=="Unicode Debug" set scintilla_debug=DEBUG=1 + - if "%configuration%"=="Unicode Release" set scintilla_debug= + - nmake NOBOOST=1 %scintilla_debug% -f scintilla.mak + - cd c:\projects\notepad-plus-plus\PowerEditor\visual.net\ + - msbuild notepadPlus.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" + +after_build: + - cd c:\projects\notepad-plus-plus\ + - ps: >- + $nppFileName = "Notepad++.$env:PLATFORM.$env:CONFIGURATION.exe" + + if ($env:PLATFORM -eq "x64" -and $env:CONFIGURATION -eq "Unicode Release") { + Push-AppveyorArtifact "PowerEditor\bin64\Notepad++.exe" -FileName "$nppFileName" + } + + if ($env:PLATFORM -eq "x64" -and $env:CONFIGURATION -eq "Unicode Debug") { + Push-AppveyorArtifact "PowerEditor\visual.net\x64\Unicode Debug\Notepad++.exe" -FileName "$nppFileName" + } + + if ($env:PLATFORM -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Release") { + Push-AppveyorArtifact "PowerEditor\bin\Notepad++.exe" -FileName "$nppFileName" + } + + if ($env:PLATFORM -eq "Win32" -and $env:CONFIGURATION -eq "Unicode Debug") { + Push-AppveyorArtifact "PowerEditor\visual.net\Unicode Debug\Notepad++.exe" -FileName "$nppFileName" + } -artifacts: - - path: 'PowerEditor\visual.net\Unicode Debug\Notepad++.exe' - name: bin + Push-AppveyorArtifact "scintilla\bin\SciLexer.dll" -FileName "SciLexer.$env:PLATFORM.$env:CONFIGURATION.dll"