Join README.GIT-RULES and CONTRIBUTING.md

This patch joins two very much related pieces of docs together in a
single file dedicated to all sorts of contributing info.

Some more changes:
- Branches info copied from the current master branch
- LXR and bonsai info removed
- Duplicated info reduced a bit
- Security branch updated to 7.1
- Refactor intro for Git commit rules
- Updated README.GIT-RULES file usage in win32/build/confutils.js
- Refactored configure.ac
This commit is contained in:
Peter Kokot 2019-03-26 00:00:36 +01:00
parent acf0411855
commit a8e879c53f
6 changed files with 121 additions and 151 deletions

View file

@ -106,7 +106,7 @@ if (MODE_PHPIZE) {
WScript.Quit(10);
}
} else {
if (!FSO.FileExists("README.GIT-RULES")) {
if (!FSO.FileExists("main\\php_version.h")) {
STDERR.WriteLine("Must be run from the root of the php source");
WScript.Quit(10);
}
@ -115,7 +115,7 @@ if (MODE_PHPIZE) {
var CWD = WshShell.CurrentDirectory;
if (typeof(CWD) == "undefined") {
CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.GIT-RULES"));
CWD = FSO.GetParentFolderName(FSO.GetParentFolderName(FSO.GetAbsolutePathName("main\\php_version.h")));
}
/* defaults; we pick up the precise versions from configure.ac */