Skip to content

Commit 572e0cb

Browse files
committed
- update vcxproj to VS2015
- updated appveyor.yml to image VS2017 - removed unnecessary sln file
1 parent b6d9e3c commit 572e0cb

4 files changed

Lines changed: 24 additions & 48 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ vs7project/NppExport.lib
1313
*.exp
1414
*.aps
1515
*.zip
16-
*.ipch
16+
*.ipch
17+
*.sln

appveyor.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 0.2.8.{build}
2-
image: Visual Studio 2015
2+
image: Visual Studio 2017
33

44

55
environment:
66
matrix:
77
- PlatformToolset: v140_xp
8-
- PlatformToolset: v120_xp
8+
- PlatformToolset: v141_xp
99

1010
platform:
1111
- x64
@@ -17,35 +17,37 @@ configuration:
1717

1818
install:
1919
- if "%platform%"=="x64" set archi=amd64
20+
- if "%platform%"=="x64" set platform_input=x64
21+
2022
- if "%platform%"=="Win32" set archi=x86
21-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
23+
- if "%platform%"=="Win32" set platform_input=Win32
24+
25+
- if "%PlatformToolset%"=="v140_xp" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
26+
- if "%PlatformToolset%"=="v141_xp" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
2227

23-
build:
24-
parallel: true # enable MSBuild parallel builds
25-
verbosity: minimal
2628

2729
build_script:
2830
- cd "%APPVEYOR_BUILD_FOLDER%"\vs7project\
29-
- msbuild NppExport.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%"
31+
- msbuild NppExport.vcxproj /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
3032

3133
after_build:
3234
- cd "%APPVEYOR_BUILD_FOLDER%"
3335
- ps: >-
3436
35-
if ($env:PLATFORM -eq "x64") {
36-
Push-AppveyorArtifact "vs7project\$env:PLATFORM\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll
37+
if ($env:PLATFORM_INPUT -eq "x64") {
38+
Push-AppveyorArtifact "vs7project\$env:PLATFORM_INPUT\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll
3739
}
3840
39-
if ($env:PLATFORM -eq "Win32" ) {
41+
if ($env:PLATFORM_INPUT -eq "Win32" ) {
4042
Push-AppveyorArtifact "vs7project\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll
4143
}
4244
43-
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v120_xp") {
44-
if($env:PLATFORM -eq "x64"){
45+
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
46+
if($env:PLATFORM_INPUT -eq "x64"){
4547
$ZipFileName = "NppExport_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
46-
7z a $ZipFileName vs7project\$env:PLATFORM\$env:CONFIGURATION\*.dll
48+
7z a $ZipFileName vs7project\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll
4749
}
48-
if($env:PLATFORM -eq "Win32"){
50+
if($env:PLATFORM_INPUT -eq "Win32"){
4951
$ZipFileName = "NppExport_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
5052
7z a $ZipFileName vs7project\$env:CONFIGURATION\*.dll
5153
}
@@ -65,6 +67,6 @@ deploy:
6567
force_update: true
6668
on:
6769
appveyor_repo_tag: true
68-
PlatformToolset: v120_xp
70+
PlatformToolset: v140_xp
6971
configuration: Release
7072

vs7project/NppExport.sln

Lines changed: 0 additions & 27 deletions
This file was deleted.

vs7project/NppExport.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -25,22 +25,22 @@
2525
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2727
<ConfigurationType>DynamicLibrary</ConfigurationType>
28-
<PlatformToolset>v120_xp</PlatformToolset>
28+
<PlatformToolset>v140_xp</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3232
<ConfigurationType>DynamicLibrary</ConfigurationType>
33-
<PlatformToolset>v120_xp</PlatformToolset>
33+
<PlatformToolset>v140_xp</PlatformToolset>
3434
<CharacterSet>Unicode</CharacterSet>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
38-
<PlatformToolset>v120_xp</PlatformToolset>
38+
<PlatformToolset>v140_xp</PlatformToolset>
3939
<CharacterSet>Unicode</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4242
<ConfigurationType>DynamicLibrary</ConfigurationType>
43-
<PlatformToolset>v120_xp</PlatformToolset>
43+
<PlatformToolset>v140_xp</PlatformToolset>
4444
<CharacterSet>Unicode</CharacterSet>
4545
</PropertyGroup>
4646
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)