Skip to content

Commit a90a51d

Browse files
committed
Merge branch 'Release/2.4'
2 parents aad6ce0 + a89fb19 commit a90a51d

27 files changed

+455
-574
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,3 +231,4 @@ OLD DLLs/
231231
*.dct
232232
*.drc
233233
*.dsk
234+
*.dsv

Contributing.md

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
# Contributing to DGH IDE Auto Save
22

3-
Please try and follows the things that are layed out below as it will make it easier to accept a pull request however not following the below does not necessarily exclude a pull request from being accepted.
3+
Please try and follows the things that are layed out below as it will make it easier to accept a pull
4+
request however not following the below does not necessarily exclude a pull request from being accepted.
45

56
## Git Flow
67

7-
For [DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918) I use Git as the version control but I also use [Git Flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for the development cycles. The main development is undertaken in the **Development** branch with stable releases being in the **master**. All pull requests should be made from the **Development** branch, prefereably using **Feature** branches or **BugFix** branches. I've defined prefixes for these already in the `.gitconfig` file. You should submit onyl one change per pull request at a time to make it easiler to review and accept the pull request.
8+
For [DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save) I use Git as the version control but I also
9+
use [Git Flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for the
10+
development cycles. The main development is undertaken in the **Development** branch with stable releases
11+
being in the **master**. All pull requests should be made from the **Development** branch, prefereably
12+
using **Feature** branches or **BugFix** branches. I've defined prefixes for these already in the
13+
`.gitconfig` file. You should submit onyl one change per pull request at a time to make it easiler to
14+
review and accept the pull request.
815

9-
Tools wise, I generally use [SourceTree](https://www.sourcetreeapp.com/) but that does not support Git Flow's **BugFix** functionality so I drop down to the command prompt to create **BugFix** branches as SourceTree can _Finish_ any type of open branch in Git Flow.
16+
Tools wise, I generally use [Fork](https://fork.dev/) but that does not support Git Flow's **BugFix**
17+
functionality so I drop down to the command prompt to create **BugFix** branches as SourceTree can
18+
_Finish_ any type of open branch in Git Flow.
1019

1120
## Creating Pull Requests
1221

13-
Having not done this before as I've always been the sole contributor to my repositories so I borrowed the essense of the following from the [DUnitX](https://github.com/VSoftTechnologies/DUnitX) project:
22+
Having not done this before as I've always been the sole contributor to my repositories so I borrowed the
23+
essense of the following from the [DUnitX](https://github.com/VSoftTechnologies/DUnitX) project:
1424

1525
1. Create a [GitHub Account](https://github.com/join);
16-
2. Fork the [DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918)
26+
2. Fork the [DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save)
1727
Repository and setup your local repository as follows:
1828
* [Fork the repository](https://help.github.com/articles/fork-a-repo);
1929
* Clone your Fork to your local machine;
2030
* Configure upstream remote to the **Development**
21-
[DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918)
22-
[repository](https://github.com/DGH2112/Integrated-Testing-Helper);
31+
[DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save)
32+
[repository](https://github.com/DGH2112/Auto-Save);
2333
3. For each change you want to make:
2434
* Create a new **Feature** or **BugFix** branch for your change;
2535
* Make your change in your new branch;
@@ -29,23 +39,30 @@ Having not done this before as I've always been the sole contributor to my repos
2939
* Submit a [Pull Request](https://help.github.com/articles/using-pull-requests);
3040
* Note: local and remote branches can be deleted after pull request has been accepted.
3141

32-
**Note:** Getting changes from others requires [Syncing your Local repository](https://help.github.com/articles/syncing-a-fork) with the **Development** [DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918) repository. This can happen at any time.
42+
**Note:** Getting changes from others requires
43+
[Syncing your Local repository](https://help.github.com/articles/syncing-a-fork) with the **Development**
44+
[DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save) repository. This can happen at any time.
3345

3446
## Dependencies
3547

36-
[DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918) has no dependencies.
48+
[DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save) has no dependencies.
3749

3850
## Project Configuration
3951

40-
The [DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918) Open Tools API project uses a single projects file (`.DPR`) to compile to mutliple versions of RAD Studio by use 2 include files: one for compiler specific coding and the second to implement the correct suffix for the DLL.
52+
The [DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save) Open Tools API project uses a single
53+
projects file (`.DPR`) to compile to mutliple versions of RAD Studio by use 2 include files: one for
54+
compiler specific coding and the second to implement the correct suffix for the DLL.
4155

4256
The current code base only supports RAD Studio XE2 and above.
4357

4458
## Rationale
4559

46-
The following is a brief description of the rationale behind [DGH IDE Auto Save](https://www.davidghoyle.co.uk/WordPress/?page_id=918). I will hopefully write more later.
60+
The following is a brief description of the rationale behind
61+
[DGH IDE Auto Save](https://github.com/DGH2112/Auto-Save). I will hopefully write more later.
4762

48-
This plug-in uses a timer to periodically iterate the code editor buffers in the RAD Studio IDE and see if they have been modified and need to be saved. It can also be configured to save before or after a compilation.
63+
This plug-in uses a timer to periodically iterate the code editor buffers in the RAD Studio IDE and see
64+
if they have been modified and need to be saved. It can also be configured to save before or after a
65+
compilation.
4966

5067
regards
5168

DGHIDEAutoSave.dpr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
DGH IDE Auto Save is a RAD Studio plug-in to automatically save your code
1212
periodically as you work.
1313
14-
Copyright (C) 2020 David Hoyle (https://github.com/DGH2112/Auto-Save/)
14+
Copyright (C) 2023 David Hoyle (https://github.com/DGH2112/Auto-Save/)
1515
1616
This program is free software: you can redistribute it and/or modify
1717
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)