diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2d01d71 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml new file mode 100644 index 0000000..21ad981 --- /dev/null +++ b/.github/workflows/CI_build.yml @@ -0,0 +1,33 @@ +name: CI_build + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-latest + strategy: + max-parallel: 6 + matrix: + build_configuration: [Release, Debug] + build_platform: [x64, Win32, ARM64] + + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1 + + - name: MSBuild of plugin dll + working-directory: .\ + run: msbuild LuaScript.sln /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:PlatformToolset="v143" + + - name: Archive artifacts + if: matrix.build_configuration == 'Release' + uses: actions/upload-artifact@v3 + with: + name: plugin_dll_${{ matrix.build_platform }} + path: | + bin\${{ matrix.build_configuration }}_${{ matrix.build_platform }}\LuaScript.dll + bin\${{ matrix.build_configuration }}_${{ matrix.build_platform }}\Lua.dll diff --git a/LuaScript.sln b/LuaScript.sln index ac9f75e..341b109 100644 --- a/LuaScript.sln +++ b/LuaScript.sln @@ -12,24 +12,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua", "src\Lua.vcxproj", "{ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|ARM64.Build.0 = Debug|ARM64 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.ActiveCfg = Debug|Win32 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.Build.0 = Debug|Win32 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.ActiveCfg = Debug|x64 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.Build.0 = Debug|x64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|ARM64.ActiveCfg = Release|ARM64 + {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|ARM64.Build.0 = Release|ARM64 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.ActiveCfg = Release|Win32 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.Build.0 = Release|Win32 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.ActiveCfg = Release|x64 {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.Build.0 = Release|x64 + {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Debug|ARM64.Build.0 = Debug|ARM64 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Debug|Win32.ActiveCfg = Debug|Win32 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Debug|Win32.Build.0 = Debug|Win32 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Debug|x64.ActiveCfg = Debug|x64 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Debug|x64.Build.0 = Debug|x64 + {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Release|ARM64.Build.0 = Release|ARM64 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Release|Win32.ActiveCfg = Release|Win32 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Release|Win32.Build.0 = Release|Win32 {FCFBB3B0-8628-4CD0-A9B7-1BFB34E31E2A}.Release|x64.ActiveCfg = Release|x64 diff --git a/appveyor.yml b/appveyor.yml index e437cc6..b2609f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ image: Visual Studio 2019 platform: - x64 - Win32 + - arm64 configuration: - Release @@ -16,15 +17,15 @@ install: - if "%platform%"=="Win32" set archi=x86 - if "%platform%"=="Win32" set build_platform=Win32 + - if "%platform%"=="arm64" set archi=amd64_arm64 + - if "%platform%"=="arm64" set build_platform=arm64 + - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% -build: - parallel: true - verbosity: minimal build_script: - cd "%APPVEYOR_BUILD_FOLDER%" - - msbuild LuaScript.sln /p:Configuration="%configuration%" /p:Platform="%build_platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + - msbuild LuaScript.sln /m /p:Configuration="%configuration%" /p:Platform="%build_platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" after_build: - cd "%APPVEYOR_BUILD_FOLDER%" @@ -39,6 +40,9 @@ after_build: if ($env:BUILD_PLATFORM -eq "x64") { $SdkFileName = "LuaScript_SDK_x64.zip" } + if ($env:BUILD_PLATFORM -eq "arm64") { + $SdkFileName = "LuaScript_SDK_arm64.zip" + } if ($env:BUILD_PLATFORM -eq "Win32") { $SdkFileName = "LuaScript_SDK.zip" } @@ -61,6 +65,9 @@ after_build: if ($env:BUILD_PLATFORM -eq "x64") { $ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip" } + if ($env:BUILD_PLATFORM -eq "arm64") { + $ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME)_arm64.zip" + } if ($env:BUILD_PLATFORM -eq "Win32") { $ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME).zip" } diff --git a/src/Lua.vcxproj b/src/Lua.vcxproj index e965e5f..d97f094 100644 --- a/src/Lua.vcxproj +++ b/src/Lua.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,6 +43,11 @@ Unicode v142 + + DynamicLibrary + Unicode + v142 + DynamicLibrary Unicode @@ -47,6 +60,12 @@ v142 true + + DynamicLibrary + Unicode + v142 + true + @@ -58,6 +77,10 @@ + + + + @@ -66,6 +89,10 @@ + + + + <_ProjectFileVersion>10.0.30319.1 @@ -73,14 +100,20 @@ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\$(ProjectName)\ true $(SolutionDir)bin\$(Configuration)_$(Platform)\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\$(ProjectName)\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\build\$(ProjectName)\ true + true $(SolutionDir)bin\$(Configuration)_$(Platform)\ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\$(ProjectName)\ false $(SolutionDir)bin\$(Configuration)_$(Platform)\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\$(ProjectName)\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\build\$(ProjectName)\ false + false .dll @@ -88,12 +121,18 @@ .dll + + .dll + .dll .dll + + .dll + %(AdditionalIncludeDirectories) @@ -157,6 +196,38 @@ + + + %(AdditionalIncludeDirectories) + WIN32;LUA_BUILD_AS_DLL;NDEBUG;_WINDOWS;_USRDLL;LuaScript_EXPORTS;__STDC_WANT_SECURE_LIB__=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ProgramDatabase + true + Size + true + MaxSpeed + Sync + true + CompileAsC + + + + + shlwapi.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + Windows + true + true + true + true + + + + + + Disabled @@ -203,6 +274,29 @@ true + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;LUA_BUILD_AS_DLL;_DEBUG;_WINDOWS;_USRDLL;LuaScript_EXPORTS;__STDC_WANT_SECURE_LIB__=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + + + + + shlwapi.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + $(OutDir)LuaScript.pdb + Windows + true + true + + diff --git a/src/LuaScript.vcxproj b/src/LuaScript.vcxproj index b99e090..7932236 100644 --- a/src/LuaScript.vcxproj +++ b/src/LuaScript.vcxproj @@ -1,6 +1,10 @@  + + Debug + ARM64 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -35,6 +43,11 @@ Unicode v142 + + DynamicLibrary + Unicode + v142 + DynamicLibrary Unicode @@ -47,6 +60,12 @@ v142 true + + DynamicLibrary + Unicode + v142 + true + @@ -58,6 +77,10 @@ + + + + @@ -66,6 +89,10 @@ + + + + <_ProjectFileVersion>10.0.30319.1 @@ -73,21 +100,33 @@ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\ true $(SolutionDir)bin\$(Configuration)_$(Platform)\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\build\ true + true $(SolutionDir)bin\$(Configuration)_$(Platform)\ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\ false $(SolutionDir)bin\$(Configuration)_$(Platform)\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\ $(SolutionDir)bin\$(Configuration)_$(Platform)\build\ + $(SolutionDir)bin\$(Configuration)_$(Platform)\build\ false + false $(ProjectName) + + $(ProjectName) + $(ProjectName) + + $(ProjectName) + .\SciTE;.\lua\src;.\Dialogs;.\Npp;.\Utilities;.\;%(AdditionalIncludeDirectories) @@ -156,6 +195,41 @@ mkdir "C:\Program Files\Notepad++\plugins\LuaScript" copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins\LuaScript" copy "$(OutDir)Lua.dll" "C:\Program Files\Notepad++\plugins\LuaScript" +) + + + + + .\SciTE;.\lua\src;.\Dialogs;.\Npp;.\Utilities;.\;%(AdditionalIncludeDirectories) + WIN32_LEAN_AND_MEAN;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(ProjectName)_EXPORTS;__STDC_WANT_SECURE_LIB__=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ProgramDatabase + true + Size + true + MaxSpeed + Sync + true + true + + + Lua.lib;shlwapi.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + Windows + true + true + true + true + $(OutDir)$(ProjectName).lib + $(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories) + + + if EXIST "C:\Program Files\Notepad++\plugins\" ( + mkdir "C:\Program Files\Notepad++\plugins\LuaScript" + copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins\LuaScript" + copy "$(OutDir)Lua.dll" "C:\Program Files\Notepad++\plugins\LuaScript" ) @@ -217,6 +291,36 @@ mkdir "C:\Program Files\Notepad++\plugins\LuaScript" copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins\LuaScript" copy "$(OutDir)Lua.dll" "C:\Program Files\Notepad++\plugins\LuaScript" +) + + + + + Disabled + .\SciTE;.\lua\src;.\Dialogs;.\Npp;.\Utilities;.\;%(AdditionalIncludeDirectories) + WIN32_LEAN_AND_MEAN;WIN32;_DEBUG;_WINDOWS;_USRDLL;$(ProjectName)_EXPORTS;__STDC_WANT_SECURE_LIB__=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + true + + + Lua.lib;shlwapi.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + $(OutDir)$(ProjectName).pdb + Windows + true + true + $(OutDir)$(ProjectName).lib + $(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories) + + + if EXIST "C:\Program Files\Notepad++\plugins\" ( + mkdir "C:\Program Files\Notepad++\plugins\LuaScript" + copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins\LuaScript" + copy "$(OutDir)Lua.dll" "C:\Program Files\Notepad++\plugins\LuaScript" )