Skip to content

Commit 273c25d

Browse files
geoffmclgeoffmcl
authored
Merge pull request #764 from htacg/issue-752
Issue #752, and other items
2 parents 0457fff + b399903 commit 273c25d

File tree

5 files changed

+71
-7
lines changed

5 files changed

+71
-7
lines changed

‎README/RELEASE.md

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# HTACG HTML Tidy
2+
3+
The **Release Process** is made up of many little steps. These have been documented before in issues like [394-1](https://github.com/htacg/tidy-html5/issues/394#issuecomment-206952915), and [394-2](https://github.com/htacg/tidy-html5/issues/394#issuecomment-207814834), and others, but this is to further **document** the process...
4+
5+
This assumes the current `next` branch is version 5.7.XXX. See VERSION.md for chosen version scheme.
6+
7+
## Release Process for 5.8.0
8+
9+
### Lead up:
10+
11+
- Create the next release milestone, 5.10, if not already done...
12+
- Decide on PR's to include, bumping version.txt, accordingly...
13+
- Decide on any show-stopper outstanding issues, and action...
14+
- Change milestone of all excluded this time issues to the next 5.10 milestone, or to indefinite...
15+
- Decide target date for release...
16+
17+
### The Release:
18+
19+
1. Update version.txt to 5.8.0, and date... commit
20+
2. Create branch, `$ git checkout -b release/5.8`
21+
3. Update README/vershist.log... perl script... commit
22+
4. Add `$ git tag 5.8.0`
23+
5. Publish `$ git push -u origin release/5.8 --tags`
24+
6. Generate release 5.8.0.html... perl script... copy to...
25+
7. Create Github release v5.8.0 - becomes [Latest Release](https://github.com/htacg/tidy-html5/releases)
26+
8. Other things?
27+
- Generate release binaries
28+
- Add [binaries](http://binaries.html-tidy.org/)
29+
- Add api [docs](http://api.html-tidy.org/#part_apiref)
30+
- Update web pages [html-tidy.org](http://www.html-tidy.org/)
31+
32+
### Post:
33+
34+
- Update `master` branch to `release`
35+
- Update `next` version.txt to 5.9.0, open for new fixes...
36+
- Add more binaries...
37+
38+
## Notes on `Release Process`:
39+
40+
This **HTACG HTML Tidy** `official` release process must be supplemented with distribution by others.
41+
42+
Of course, if possible, we recomend building tidy from the git source, it is easy, but also in some OS'es others offer distribution in various ways...
43+
44+
See [Get Tidy](http://www.html-tidy.org/#homepage19700601get_tidy) - This page really needs expanding. There are some suggestions pending, and more feedback welcome...
45+
46+
; eof

‎include/tidy.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -481,16 +481,16 @@ TIDY_EXPORT void TIDY_CALL tidyGeneralInfo( TidyDoc tdoc );
481481

482482

483483
/** Load an ASCII Tidy configuration file and set the configuration per its
484-
** contents.
485-
** @result Returns 0 upon success, or any other value if there was an error.
484+
** contents. Reports config option errors, which can be filtered.
485+
** @result Returns 0 upon success, or any other value if there was an option error.
486486
*/
487487
TIDY_EXPORT int TIDY_CALL tidyLoadConfig(TidyDoc tdoc, /**< The TidyDoc to which to apply the configuration. */
488488
ctmbstr configFile /**< The complete path to the file to load. */
489489
);
490490

491491
/** Load a Tidy configuration file with the specified character encoding, and
492-
** set the configuration per its contents.
493-
** @result Returns 0 upon success, or any other value if there was an error.
492+
** set the configuration per its contents. Reports config option errors, which can be filtered.
493+
** @result Returns 0 upon success, or any other value if there was an option error.
494494
*/
495495
TIDY_EXPORT int TIDY_CALL tidyLoadConfigEnc(TidyDoc tdoc, /**< The TidyDoc to which to apply the configuration. */
496496
ctmbstr configFile, /**< The complete path to the file to load. */

‎src/config.c

+19-1
Original file line numberDiff line numberDiff line change
@@ -877,8 +877,26 @@ static ctmbstr ExpandTilde( TidyDocImpl* doc, ctmbstr filename )
877877
if (filename[1] == '/')
878878
{
879879
home_dir = getenv("HOME");
880-
if ( home_dir )
880+
if (home_dir) {
881881
++filename;
882+
}
883+
#ifdef _WIN32
884+
else if (strlen(filename) >= 3) { /* at least '~/+1' */
885+
/* no HOME env in Windows - got for HOMEDRIVE=C: HOMEPATH=\Users\user */
886+
char * hd = getenv("HOMEDRIVE");
887+
char * hp = getenv("HOMEPATH");
888+
if (hd && hp) {
889+
ctmbstr s = TidyDocAlloc(doc, _MAX_PATH);
890+
strcpy(s, hd);
891+
strcat(s, hp);
892+
strcat(s, "\\");
893+
strcat(s, &filename[2]);
894+
return s;
895+
}
896+
897+
}
898+
#endif /* _WIN32 */
899+
882900
}
883901
#ifdef SUPPORT_GETPWNAM
884902
else

‎src/language_en.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2194,7 +2194,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
21942194
{ TC_LABEL_LANG, 0, "lang" },
21952195
{ TC_LABEL_LEVL, 0, "level" },
21962196
{ TC_LABEL_OPT, 0, "option" },
2197-
{ TC_MAIN_ERROR_LOAD_CONFIG, 0, "Loading config file \"%s\" failed, err = %d" },
2197+
{ TC_MAIN_ERROR_LOAD_CONFIG, 0, "Loading config file \"%s\" problems, err = %d" },
21982198
{ TC_OPT_ACCESS, 0,
21992199
"do additional accessibility checks (<level> = 0, 1, 2, 3). 0 is "
22002200
"assumed if <level> is missing."

‎src/message.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static struct _dispatchTable {
347347
{ STRING_CONTENT_LOOKS, TidyInfo, formatStandard }, /* reportMarkupVersion() */
348348
{ STRING_DOCTYPE_GIVEN, TidyInfo, formatStandard }, /* reportMarkupVersion() */
349349
{ STRING_MISSING_MALFORMED, TidyConfig, formatStandard },
350-
{ STRING_MUTING_TYPE, TidyConfig, formatStandard },
350+
{ STRING_MUTING_TYPE, TidyInfo, formatStandard },
351351
{ STRING_NO_SYSID, TidyInfo, formatStandard }, /* reportMarkupVersion() */
352352
{ STRING_UNKNOWN_OPTION, TidyConfig, formatStandard },
353353
{ SUSPECTED_MISSING_QUOTE, TidyWarning, formatStandard },

0 commit comments

Comments
 (0)