From 572e0cb2f5e64d2d43914b4a5787bfbead12da92 Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Sat, 6 Jan 2018 00:43:53 +0100 Subject: [PATCH] - update vcxproj to VS2015 - updated appveyor.yml to image VS2017 - removed unnecessary sln file --- .gitignore | 3 ++- appveyor.yml | 32 +++++++++++++++++--------------- vs7project/NppExport.sln | 27 --------------------------- vs7project/NppExport.vcxproj | 10 +++++----- 4 files changed, 24 insertions(+), 48 deletions(-) delete mode 100644 vs7project/NppExport.sln diff --git a/.gitignore b/.gitignore index 7cce095..dcfc016 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ vs7project/NppExport.lib *.exp *.aps *.zip -*.ipch \ No newline at end of file +*.ipch +*.sln \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index f896218..c5c79ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,11 @@ version: 0.2.8.{build} -image: Visual Studio 2015 +image: Visual Studio 2017 environment: matrix: - PlatformToolset: v140_xp - - PlatformToolset: v120_xp + - PlatformToolset: v141_xp platform: - x64 @@ -17,35 +17,37 @@ configuration: install: - if "%platform%"=="x64" set archi=amd64 + - if "%platform%"=="x64" set platform_input=x64 + - if "%platform%"=="Win32" set archi=x86 - - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi% + - 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 "%PlatformToolset%"=="v141_xp" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% -build: - parallel: true # enable MSBuild parallel builds - verbosity: minimal build_script: - cd "%APPVEYOR_BUILD_FOLDER%"\vs7project\ - - msbuild NppExport.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%" + - msbuild NppExport.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 -eq "x64") { - Push-AppveyorArtifact "vs7project\$env:PLATFORM\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll + if ($env:PLATFORM_INPUT -eq "x64") { + Push-AppveyorArtifact "vs7project\$env:PLATFORM_INPUT\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll } - if ($env:PLATFORM -eq "Win32" ) { + if ($env:PLATFORM_INPUT -eq "Win32" ) { Push-AppveyorArtifact "vs7project\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll } - if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v120_xp") { - if($env:PLATFORM -eq "x64"){ + if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") { + if($env:PLATFORM_INPUT -eq "x64"){ $ZipFileName = "NppExport_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip" - 7z a $ZipFileName vs7project\$env:PLATFORM\$env:CONFIGURATION\*.dll + 7z a $ZipFileName vs7project\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll } - if($env:PLATFORM -eq "Win32"){ + if($env:PLATFORM_INPUT -eq "Win32"){ $ZipFileName = "NppExport_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" 7z a $ZipFileName vs7project\$env:CONFIGURATION\*.dll } @@ -65,6 +67,6 @@ deploy: force_update: true on: appveyor_repo_tag: true - PlatformToolset: v120_xp + PlatformToolset: v140_xp configuration: Release diff --git a/vs7project/NppExport.sln b/vs7project/NppExport.sln deleted file mode 100644 index 4b92584..0000000 --- a/vs7project/NppExport.sln +++ /dev/null @@ -1,27 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppExport", "NppExport.vcxproj", "{09A365CA-B3D6-4878-A2BD-286EA81265B9}" -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 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Debug|Win32.ActiveCfg = Debug|Win32 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Debug|Win32.Build.0 = Debug|Win32 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Debug|x64.ActiveCfg = Debug|x64 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Debug|x64.Build.0 = Debug|x64 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Release|Win32.ActiveCfg = Release|Win32 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Release|Win32.Build.0 = Release|Win32 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Release|x64.ActiveCfg = Release|x64 - {09A365CA-B3D6-4878-A2BD-286EA81265B9}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/vs7project/NppExport.vcxproj b/vs7project/NppExport.vcxproj index 6fbf876..c9d3f51 100644 --- a/vs7project/NppExport.vcxproj +++ b/vs7project/NppExport.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -25,22 +25,22 @@ DynamicLibrary - v120_xp + v140_xp Unicode DynamicLibrary - v120_xp + v140_xp Unicode DynamicLibrary - v120_xp + v140_xp Unicode DynamicLibrary - v120_xp + v140_xp Unicode