Skip to content

Commit a0818eb

Browse files
pnedevpnedev
committed
Release version 2.0.2
Reflects Notepad++ v8.2.2 and above Scintilla changes. No functional changes to the plugin.
1 parent 26c368a commit a0818eb

19 files changed

+478
-996
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ A very useful diff plugin to show the difference between:
1010
Build Status
1111
------------
1212

13-
- AppVeyor `VS2013` and `VS2015` [![Build status](https://ci.appveyor.com/api/projects/status/github/pnedev/compare-plugin?svg=true)](https://ci.appveyor.com/project/pnedev/compare-plugin)
13+
- AppVeyor `VS2015` [![Build status](https://ci.appveyor.com/api/projects/status/github/pnedev/compare-plugin?svg=true)](https://ci.appveyor.com/project/pnedev/compare-plugin)
1414

1515
Build Compare plugin for Notepad++ from source:
1616
-------------------------------
1717

18-
1. Open [`plugin_compare\compare-plugin\projects\2013\Compare.vcxproj`](https://github.com/pnedev/compare-plugin/blob/master/projects/2013/Compare.vcxproj)
18+
1. Open [`plugin_compare\compare-plugin\projects\2015\Compare.vcxproj`](https://github.com/pnedev/compare-plugin/blob/master/projects/2015/Compare.vcxproj)
1919
2. Build Compare plugin [like a normal Visual Studio project](https://msdn.microsoft.com/en-us/library/7s88b19e.aspx). Available platforms are x86 win32 and x64 for Unicode Release and Debug.
2020
3. CMake config is available and tested for the generators MinGW Makefiles, Visual Studio and NMake Makefiles
2121

‎appveyor.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ image: Visual Studio 2015
33

44
environment:
55
matrix:
6-
- PlatformToolset: v140_xp
7-
- PlatformToolset: v120_xp
6+
- PlatformToolset: v140
87

98
platform:
109
- x64
@@ -24,7 +23,7 @@ build:
2423
verbosity: minimal
2524

2625
build_script:
27-
- cd "%APPVEYOR_BUILD_FOLDER%"\projects\2013\
26+
- cd "%APPVEYOR_BUILD_FOLDER%"\projects\2015\
2827
- msbuild Compare.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%"
2928

3029
after_build:
@@ -33,7 +32,7 @@ after_build:
3332
3433
Push-AppveyorArtifact "Notepad++\plugins\ComparePlugin.dll" -FileName ComparePlugin.dll
3534
36-
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release Unicode" -and $env:PLATFORMTOOLSET -eq "v120_xp") {
35+
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release Unicode" -and $env:PLATFORMTOOLSET -eq "v140") {
3736
$ZipFileName = "ComparePlugin_$($env:APPVEYOR_REPO_TAG_NAME)_$env:PLATFORM.zip"
3837
Remove-Item .\Notepad++\plugins\*.pdb
3938
7z a $ZipFileName .\Notepad++\plugins\*
@@ -43,15 +42,15 @@ artifacts:
4342
- path: ComparePlugin_*.zip
4443
name: releases
4544

46-
deploy:
47-
provider: GitHub
48-
auth_token:
49-
secure: 7/ifzsk2Tk/V63jr6/WyA4HdmukWhg2PD7pCgJma7f/QYuZCsyE6RZ5M3RIr6JVc
50-
artifact: releases
51-
draft: false
52-
prerelease: false
53-
force_update: true
54-
on:
55-
appveyor_repo_tag: true
56-
PlatformToolset: v120_xp
57-
configuration: Release Unicode
45+
# deploy:
46+
# provider: GitHub
47+
# auth_token:
48+
# secure:
49+
# artifact: releases
50+
# draft: false
51+
# prerelease: false
52+
# force_update: true
53+
# on:
54+
# appveyor_repo_tag: true
55+
# PlatformToolset: v140
56+
# configuration: Release Unicode

‎projects/2013/Compare.sln

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

‎projects/2013/Compare.vcxproj

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

‎projects/2013/Compare.vcxproj.filters

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

‎projects/2015/Compare.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
2828
<ConfigurationType>DynamicLibrary</ConfigurationType>
2929
<CharacterSet>Unicode</CharacterSet>
30-
<PlatformToolset>v140_xp</PlatformToolset>
30+
<PlatformToolset>v140</PlatformToolset>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
3333
<ConfigurationType>DynamicLibrary</ConfigurationType>
3434
<CharacterSet>Unicode</CharacterSet>
35-
<PlatformToolset>v140_xp</PlatformToolset>
35+
<PlatformToolset>v140</PlatformToolset>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
3838
<ConfigurationType>DynamicLibrary</ConfigurationType>
3939
<CharacterSet>Unicode</CharacterSet>
40-
<PlatformToolset>v140_xp</PlatformToolset>
40+
<PlatformToolset>v140</PlatformToolset>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<CharacterSet>Unicode</CharacterSet>
45-
<PlatformToolset>v140_xp</PlatformToolset>
45+
<PlatformToolset>v140</PlatformToolset>
4646
</PropertyGroup>
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4848
<ImportGroup Label="ExtensionSettings">

‎src/Compare.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ toolbarIcons tbLast;
516516
toolbarIcons tbNavBar;
517517

518518
HINSTANCE hInstance;
519-
FuncItem funcItem[NB_MENU_COMMANDS] = { 0 };
519+
FuncItem funcItem[NB_MENU_COMMANDS];
520520

521521
// Declare local functions that appear before they are defined
522522
void First();
@@ -1883,21 +1883,21 @@ void onToolBarReady()
18831883
tbNavBar.hToolbarBmp =
18841884
(HBITMAP)::LoadImage(hInstance, MAKEINTRESOURCE(IDB_NAVBAR), IMAGE_BITMAP, 0, 0, style);
18851885

1886-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1886+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18871887
(WPARAM)funcItem[CMD_SET_FIRST]._cmdID, (LPARAM)&tbSetFirst);
1888-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1888+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18891889
(WPARAM)funcItem[CMD_COMPARE]._cmdID, (LPARAM)&tbCompare);
1890-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1890+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18911891
(WPARAM)funcItem[CMD_CLEAR_ACTIVE]._cmdID, (LPARAM)&tbClearCompare);
1892-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1892+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18931893
(WPARAM)funcItem[CMD_FIRST]._cmdID, (LPARAM)&tbFirst);
1894-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1894+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18951895
(WPARAM)funcItem[CMD_PREV]._cmdID, (LPARAM)&tbPrev);
1896-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1896+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18971897
(WPARAM)funcItem[CMD_NEXT]._cmdID, (LPARAM)&tbNext);
1898-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1898+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
18991899
(WPARAM)funcItem[CMD_LAST]._cmdID, (LPARAM)&tbLast);
1900-
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
1900+
::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
19011901
(WPARAM)funcItem[CMD_NAV_BAR]._cmdID, (LPARAM)&tbNavBar);
19021902

19031903
NppSettings::get().updatePluginMenu();

0 commit comments

Comments
 (0)