Skip to content

Commit f91e354

Browse files
committed
Update project path and README info
1 parent bc693ac commit f91e354

File tree

3 files changed

+60
-30
lines changed

3 files changed

+60
-30
lines changed

Help.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,5 @@ You can set your own shortcuts to all CP commands via Notepad++ Settings -> Shor
105105

106106
You can use the excellent **Customize Toolbar** plugin (by Dave) to add, move and remove any toolbar buttons.
107107
***
108-
**[Requests and Issues-Report](https://github.com/pnedev/compare-plugin/issues)**
109-
**Thank you for [Donating](https://www.paypal.me/pnedev).**
108+
**[Requests and Issues-Report](https://github.com/pnedev/comparePlus/issues)**
109+
**Thank you for [Donating](https://www.paypal.com/paypalme/pnedev).**

README.md

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,92 @@
11
ComparePlus plugin for Notepad++
22
------------
33

4-
A very useful diff plugin to show the difference between:
5-
- 2 files (side by side)
6-
- Diff against Git (with the help of [libgit2](https://github.com/libgit2/libgit2) )
7-
- Diff against SVN (with the help of [sqlite](https://sqlite.org) )
8-
- Diff since last Save
4+
ComparePlus is a plugin for Notepad++ that allows the user to:
5+
6+
- Compare two files and show differences side by side
7+
- Compare only parts (selections) of two files
8+
- Find unique lines between two files
9+
- Diff a file against Git (with the help of [libgit2](https://github.com/libgit2/libgit2) )
10+
- Diff a file against SVN (with the help of [sqlite](https://sqlite.org) )
11+
- Diff a changed file since it was last saved
12+
- Diff a file or parts of it against clipboard text content
13+
14+
It is highly customizable, can ignore spaces, empty lines, letter cases, regexes, can find moves and show character diffs.
15+
Several compared file pairs can be active and displayed at the same time.
16+
917

1018
Build Status
1119
------------
1220

13-
- AppVeyor `VS2017` [![Build status](https://ci.appveyor.com/api/projects/status/github/pnedev/compare-plugin?svg=true)](https://ci.appveyor.com/project/pnedev/compare-plugin)
21+
- AppVeyor [![Build status](https://ci.appveyor.com/api/projects/status/github/pnedev/comparePlus?svg=true)](https://ci.appveyor.com/project/pnedev/comparePlus)
1422

15-
Build ComparePlus plugin for Notepad++ from source:
16-
-------------------------------
17-
18-
1. Open [`plugin_compare\compare-plugin\projects\2017\ComparePlus.vcxproj`](https://github.com/pnedev/compare-plugin/blob/master/projects/2017/ComparePlus.vcxproj)
19-
2. Build ComparePlus 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.
20-
3. CMake config is available and tested for the generators MinGW Makefiles, Visual Studio and NMake Makefiles
2123

2224
Installation:
2325
----------
2426

25-
To install the plugin automatically use the Notepad++ PluginAdmin dialog (available since v7.6.3, find it in the `Plugins` menu).
27+
** ComparePlus plugin is available for Notepad++ versions above v8.4.2 (included) **
2628

27-
To install the plugin manually follow the instructions below based on your current Notepad++ version.
29+
To install the plugin automatically use the Notepad++ PluginAdmin dialog (find it in the `Plugins` menu).
2830

29-
** Important Note: ** ** If you are installing Compare plugin (not ComparePlus) replace all *ComparePlus* names in the instructions below with *ComparePlugin*. Please note that ComparePlus has not been released yet. **
31+
To install the plugin manually:
3032

31-
7.6.3 and above:
3233
1. Create `ComparePlus` folder in Notepad++'s plugins installation folder (`%Notepad++_program_folder%\Plugins`).
33-
2. Copy the contents of the [Latest Release](https://github.com/pnedev/compare-plugin/releases/latest) zip file
34+
2. Copy the contents of the desired ComparePlus [release](https://github.com/pnedev/comparePlus/releases) zip file
3435
into the newly created folder. Please use the correct archive version based on your Notepad++ architecture - x86 or x64.
3536
- ComparePlus.dll : The core plugin DLL.
3637
- ComparePlus sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands.
3738
3. Restart Notepad++.
3839

39-
Pre 7.6.0:
40-
1. Copy the contents of the [Latest Release](https://github.com/pnedev/compare-plugin/releases/latest) zip file
40+
41+
-------------------------------
42+
** IMPORTANT NOTE: **
43+
** This GitHub project is also the home of the latest [source](https://github.com/pnedev/comparePlus/tree/Compare_v2) and [releases](https://github.com/pnedev/comparePlus/releases) of Compare-plugin for Notepad++. ComparePlus is its highly advanced successor and is meant to be its replacement so Compare-plugin will no longer be supported (at least by me) **
44+
45+
To install Compare-plugin you can either use the Notepad++ PluginAdmin dialog that will it automatically
46+
or you can do it manually as described in the following steps based on your Notepad++ version:
47+
48+
v7.6.3 and above:
49+
50+
1. Create `ComparePlugin` folder in Notepad++'s plugins installation folder (`%Notepad++_program_folder%\Plugins`).
51+
2. Copy the contents of the desired Compare-plugin [release](https://github.com/pnedev/comparePlus/releases) zip file
52+
into the newly created folder. Please use the correct archive version based on your Notepad++ architecture - x86 or x64.
53+
- ComparePlugin.dll : The core plugin DLL.
54+
- ComparePlugin sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands.
55+
3. Restart Notepad++.
56+
57+
Pre v7.6.0:
58+
59+
1. Copy the contents of the desired Compare-plugin [release](https://github.com/pnedev/comparePlus/releases) zip file
4160
into Notepad++'s plugins installation folder (`%Notepad++_program_folder%\Plugins`).
4261
Please use the correct archive version based on your Notepad++ architecture - x86 or x64.
43-
- ComparePlus.dll : The core plugin DLL.
44-
- ComparePlus sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands.
62+
- ComparePlugin.dll : The core plugin DLL.
63+
- ComparePlugin sub-folder : Contains the libs libgit2.dll and sqlite.dll needed for the Diff against Git and SVN commands.
4564
2. Restart Notepad++.
4665

66+
67+
To build ComparePlus plugin for Notepad++ from source:
68+
-------------------------------
69+
70+
1. Open [`comparePlus\projects\2017\ComparePlus.vcxproj`](https://github.com/pnedev/comparePlus/blob/master/projects/2017/ComparePlus.vcxproj)
71+
2. Build ComparePlus plugin like a normal Visual Studio project. Available platforms are x86 win32 and x64 for Unicode Release and Debug. Arm64 build is also available.
72+
3. CMake config is available and tested for the generators MinGW Makefiles, Visual Studio and NMake Makefiles
73+
74+
4775
Get ComparePlus plugin for Notepad++ at the web:
4876
-------------------------------
4977

50-
- from GitHub project link [Releases section](https://github.com/pnedev/compare-plugin/releases)
51-
- manual download of continuous builds from [Appveyor](https://ci.appveyor.com/project/pnedev/compare-plugin/history)
78+
- from GitHub project [Releases section](https://github.com/pnedev/comparePlus/releases)
79+
- manual download of continuous builds from [Appveyor](https://ci.appveyor.com/project/pnedev/comparePlus/history)
80+
5281

5382
Additional information:
5483
----------
5584

56-
- ComparePlus plugin for Notepad++ [Contributors](https://github.com/pnedev/compare-plugin/graphs/contributors)
85+
- ComparePlus plugin for Notepad++ [Contributors](https://github.com/pnedev/comparePlus/graphs/contributors)
5786
- See also the [Notepad++ official site](http://notepad-plus-plus.org/) for more information.
5887

88+
5989
Changelog:
6090
----------
6191

62-
see [`ReleaseNotes.txt`](https://github.com/pnedev/compare-plugin/blob/master/ReleaseNotes.txt)
92+
see [`ReleaseNotes.txt`](https://github.com/pnedev/comparePlus/blob/master/ReleaseNotes.txt)

src/AboutDlg/AboutDialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include "DockingFeature/Window.h"
2626

2727

28-
static const TCHAR cDonate_URL[] = TEXT("https://paypal.me/pnedev");
29-
static const TCHAR cRepo_URL[] = TEXT("https://github.com/pnedev/compare-plugin");
30-
static const TCHAR cHelp_URL[] = TEXT("https://github.com/pnedev/compare-plugin/blob/master/Help.md");
28+
static const TCHAR cDonate_URL[] = TEXT("https://www.paypal.com/paypalme/pnedev");
29+
static const TCHAR cRepo_URL[] = TEXT("https://github.com/pnedev/comparePlus");
30+
static const TCHAR cHelp_URL[] = TEXT("https://github.com/pnedev/comparePlus/blob/master/Help.md");
3131

3232

3333
UINT AboutDialog::doDialog()

0 commit comments

Comments
 (0)