diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index 5191a71..c794b49 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -7,10 +7,10 @@ jobs: runs-on: windows-latest strategy: - max-parallel: 4 + max-parallel: 6 matrix: build_configuration: [Release, Debug] - build_platform: [x64, Win32] + build_platform: [x64, Win32, ARM64] steps: - name: Checkout repo @@ -36,3 +36,10 @@ jobs: with: name: plugin_dll_x86 path: bin\${{ matrix.build_platform }}\NppTaskList.dll + + - name: Archive artifacts for ARM64 + if: matrix.build_platform == 'ARM64' && matrix.build_configuration == 'Release' + uses: actions/upload-artifact@v2 + with: + name: plugin_dll_arm64 + path: bin\${{ matrix.build_platform }}\NppTaskList.dll diff --git a/.gitignore b/.gitignore index bdc9ad3..a6f2f30 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Release bin .vs *.vcxproj.user +*.vcxproj.filters diff --git a/NppTaskList.sln b/NppTaskList.sln deleted file mode 100644 index fe58dc3..0000000 --- a/NppTaskList.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppTaskList", "NppTaskList.vcxproj", "{7A828FAB-ECAE-467C-B447-943D7607832B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7A828FAB-ECAE-467C-B447-943D7607832B}.Debug|Win32.ActiveCfg = Debug|Win32 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Debug|Win32.Build.0 = Debug|Win32 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Debug|x64.ActiveCfg = Debug|x64 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Debug|x64.Build.0 = Debug|x64 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Release|Win32.ActiveCfg = Release|Win32 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Release|Win32.Build.0 = Release|Win32 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Release|x64.ActiveCfg = Release|x64 - {7A828FAB-ECAE-467C-B447-943D7607832B}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/NppTaskList.vcxproj b/NppTaskList.vcxproj index 4e9340a..1857253 100644 --- a/NppTaskList.vcxproj +++ b/NppTaskList.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -22,31 +30,45 @@ {7A828FAB-ECAE-467C-B447-943D7607832B} Win32Proj NppTaskList + 10.0 DynamicLibrary true - v141_xp + v142 Unicode DynamicLibrary true - v141_xp + v142 + Unicode + + + DynamicLibrary + true + v142 Unicode DynamicLibrary false - v141_xp + v142 true Unicode DynamicLibrary false - v141_xp + v142 + true + Unicode + + + DynamicLibrary + false + v142 true Unicode @@ -59,12 +81,18 @@ + + + + + + true @@ -78,6 +106,12 @@ .\bin\debug\$(Platform)\ $(Configuration)\$(Platform)\ + + $(Configuration)\$(Platform)\ + .\bin\debug\$(Platform)\ + true + .\include;$(IncludePath) + false .\include;$(IncludePath) @@ -90,13 +124,17 @@ .\bin\$(Platform)\ $(Configuration)\$(Platform)\ + + $(Configuration)\$(Platform)\ + .\bin\$(Platform)\ + false + .\include;$(IncludePath) + Level4 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - false MultiThreadedDebug true @@ -127,6 +165,24 @@ shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + Speed + MultiThreadedDebug + true + true + false + + + Windows + true + shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + Level4 @@ -134,8 +190,6 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - false MultiThreaded true @@ -153,8 +207,27 @@ Level4 - - + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINTASKLIST_EXPORTS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + MultiThreaded + true + true + + + Windows + false + true + true + shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(TargetName).lib + + + + + Level4 MaxSpeed true true diff --git a/NppTaskList.vcxproj.filters b/NppTaskList.vcxproj.filters deleted file mode 100644 index 0536d9c..0000000 --- a/NppTaskList.vcxproj.filters +++ /dev/null @@ -1,101 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 1db1247..18d0558 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,6 @@ version: 2.3.{build} environment: matrix: - - PlatformToolset: v141_xp - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PlatformToolset: v142 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 @@ -12,6 +9,7 @@ environment: platform: - x64 - Win32 + - arm64 configuration: - Release @@ -25,38 +23,29 @@ install: - if "%platform%"=="Win32" set archi=x86 - if "%platform%"=="Win32" set platform_input=Win32 - - if "%PlatformToolset%"=="v140_xp" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi% + - if "%platform%"=="arm64" set archi=amd64_arm64 + - if "%platform%"=="arm64" set platform_input=arm64 + - if "%PlatformToolset%"=="v141_xp" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% - if "%PlatformToolset%"=="v142" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% build_script: - cd "%APPVEYOR_BUILD_FOLDER%" - - msbuild NppTaskList.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + - msbuild NppTaskList.vcxproj /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" after_build: - cd "%APPVEYOR_BUILD_FOLDER%" - ps: >- - if ($env:PLATFORM_INPUT -eq "x64" -and $env:CONFIGURATION -eq "Release") { - #Push-AppveyorArtifact "bin\$env:PLATFORM_INPUT\NppTaskList.dll" -FileName NppTaskList.dll - } - - if ($env:PLATFORM_INPUT -eq "Win32" -and $env:CONFIGURATION -eq "Release") { - #Push-AppveyorArtifact "bin\$env:PLATFORM_INPUT\NppTaskList.dll" -FileName NppTaskList.dll + if ($env:CONFIGURATION -eq "Release") { + Push-AppveyorArtifact "bin\$env:PLATFORM_INPUT\NppTaskList.dll" -FileName NppTaskList.dll } - if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v141_xp") { - if($env:PLATFORM_INPUT -eq "x64"){ - $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip" - 7z a $ZipFileName .\bin\$env:PLATFORM_INPUT\NppTaskList.dll - 7z a $ZipFileName config\npp_task_list.cfg - } - if($env:PLATFORM_INPUT -eq "Win32"){ - $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" + if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v142") { + $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_$($env:PLATFORM_INPUT).zip" 7z a $ZipFileName .\bin\$env:PLATFORM_INPUT\NppTaskList.dll 7z a $ZipFileName config\npp_task_list.cfg - } } artifacts: @@ -73,5 +62,5 @@ deploy: force_update: true on: appveyor_repo_tag: true - PlatformToolset: v141_xp + PlatformToolset: v142 configuration: Release