Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions PyNPP.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Expand All @@ -90,7 +87,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Expand All @@ -107,6 +104,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -118,11 +116,14 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
Expand Down
27 changes: 15 additions & 12 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version: 1.2.1.{build}
image: Visual Studio 2015
image: Visual Studio 2017


environment:
matrix:
- PlatformToolset: v140_xp
- PlatformToolset: v141_xp

platform:
- x64
Expand All @@ -17,35 +18,37 @@ configuration:

install:
- if "%platform%"=="x64" set archi=amd64
- if "%platform%"=="x64" set platform_input=x64

- if "%platform%"=="x86" set archi=x86
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
- if "%platform%"=="x86" set platform_input=x86

- 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%"
- msbuild PyNPP.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
- msbuild PyNPP.sln /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 "$env:PLATFORM\$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
if ($env:PLATFORM_INPUT -eq "x64") {
Push-AppveyorArtifact "$env:PLATFORM_INPUT\$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
}

if ($env:PLATFORM -eq "x86" ) {
if ($env:PLATFORM_INPUT -eq "x86" ) {
Push-AppveyorArtifact "$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
}

if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
if($env:PLATFORM -eq "x64"){
if($env:PLATFORM_INPUT -eq "x64"){
$ZipFileName = "PyNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
7z a $ZipFileName $env:PLATFORM\$env:CONFIGURATION\PyNPP.dll
7z a $ZipFileName $env:PLATFORM_INPUT\$env:CONFIGURATION\PyNPP.dll
}
if($env:PLATFORM -eq "x86"){
if($env:PLATFORM_INPUT -eq "x86"){
$ZipFileName = "PyNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
7z a $ZipFileName $env:CONFIGURATION\PyNPP.dll
}
Expand Down