emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make this version 5.0.0

Browse source
This commit is contained in:
Geoff McLane 2015-01-22 13:40:50 +01:00
parent 7c1211c879
commit 4a3f5ecf07
5 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required (VERSION 2.8)
project (tidy5) project (tidy5)
# ### NOTE: *** Adjust when required *** # ### NOTE: *** Adjust when required ***
set( TIDY_MAJOR_VERSION 1 ) set( TIDY_MAJOR_VERSION 5 )
set( TIDY_MINOR_VERSION 0 ) set( TIDY_MINOR_VERSION 0 )
set( TIDY_MICRO_VERSION 0 ) set( TIDY_MICRO_VERSION 0 )
set( LIBTIDY_VERSION "${TIDY_MAJOR_VERSION}.${TIDY_MINOR_VERSION}.${TIDY_MICRO_VERSION}" ) set( LIBTIDY_VERSION "${TIDY_MAJOR_VERSION}.${TIDY_MINOR_VERSION}.${TIDY_MICRO_VERSION}" )
@ -65,10 +65,7 @@ add_definitions ( -DSUPPORT_UTF16_ENCODINGS=1 )
add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 ) add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 )
add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 ) add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 )
add_definitions ( -DRELEASE_DATE="${tidy_YEAR}/${tidy_MONTH}/${tidy_DAY}" ) add_definitions ( -DRELEASE_DATE="${tidy_YEAR}/${tidy_MONTH}/${tidy_DAY}" )
# to distinguish between debug and release lib add_definitions ( -DLIBTIDY_VERSION="${TIDY_MAJOR_VERSION}.${TIDY_MINOR_VERSION}.${TIDY_MICRO_VERSION}" )
if (WIN32)
set( CMAKE_DEBUG_POSTFIX "d" )
endif(WIN32)
if(BUILD_SHARED_LIB) if(BUILD_SHARED_LIB)
set(LIB_TYPE SHARED) set(LIB_TYPE SHARED)

10
console/tidy.c
View file

@ -437,8 +437,8 @@ static void help( ctmbstr prog )
printf( "Utility to clean up and pretty print HTML/XHTML/XML\n"); printf( "Utility to clean up and pretty print HTML/XHTML/XML\n");
printf( "\n"); printf( "\n");
printf( "This is an HTML5-aware experimental fork of HTML Tidy.\n"); printf( "This is an HTML5-aware experimental fork of HTML Tidy. Date %s. Version %s\n",
printf( "%s\n", tidyReleaseDate() ); tidyReleaseDate(), tidyLibraryVersion() );
printf( "\n"); printf( "\n");
#ifdef PLATFORM_NAME #ifdef PLATFORM_NAME
@ -782,7 +782,7 @@ void printXMLOption( TidyDoc tdoc, TidyOption topt, OptionDesc *d )
static void XMLoptionhelp( TidyDoc tdoc ) static void XMLoptionhelp( TidyDoc tdoc )
{ {
printf( "<?xml version=\"1.0\"?>\n" printf( "<?xml version=\"1.0\"?>\n"
"<config version=\"%s\">\n", tidyReleaseDate()); "<config date=\"%s\" version=\"%s\">\n", tidyReleaseDate(), tidyLibraryVersion());
ForEachOption( tdoc, printXMLOption ); ForEachOption( tdoc, printXMLOption );
printf( "</config>\n" ); printf( "</config>\n" );
} }
@ -943,8 +943,8 @@ static void optionvalues( TidyDoc tdoc )
static void version( void ) static void version( void )
{ {
#ifdef PLATFORM_NAME #ifdef PLATFORM_NAME
printf( "HTML Tidy for HTML5 (experimental) for %s %s\n", printf( "HTML Tidy for HTML5 (experimental) for %s %s, version %s\n",
PLATFORM_NAME, tidyReleaseDate() ); PLATFORM_NAME, tidyReleaseDate(), tidyLibraryVersion() );
#else #else
printf( "HTML Tidy for HTML5 (experimental) %s\n", tidyReleaseDate() ); printf( "HTML Tidy for HTML5 (experimental) %s\n", tidyReleaseDate() );
#endif #endif

3
include/tidy.h
View file

@ -327,6 +327,9 @@ TIDY_EXPORT void* TIDY_CALL tidyGetAppData( TidyDoc tdoc );
/** Get release date (version) for current library */ /** Get release date (version) for current library */
TIDY_EXPORT ctmbstr TIDY_CALL tidyReleaseDate(void); TIDY_EXPORT ctmbstr TIDY_CALL tidyReleaseDate(void);
/** Get version number for the current library */
TIDY_EXPORT ctmbstr tidyLibraryVersion(void);
/* Diagnostics and Repair /* Diagnostics and Repair
*/ */

6
src/localize.c
View file

@ -34,6 +34,12 @@ ctmbstr TY_(ReleaseDate)(void)
return TY_(release_date); return TY_(release_date);
} }
ctmbstr tidyLibraryVersion(void)
{
return TY_(library_version);
}
static struct _msgfmt static struct _msgfmt
{ {
uint code; uint code;

8
src/version.h
View file

@ -1,6 +1,6 @@
/* version information /* version information
(c) 2007-2009 (W3C) MIT, ERCIM, Keio University (c) 2007-2015 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice. See tidy.h for the copyright notice.
*/ */
@ -10,4 +10,10 @@ static const char TY_(release_date)[] = RELEASE_DATE;
#else #else
static const char TY_(release_date)[] = "2014/08/03"; static const char TY_(release_date)[] = "2014/08/03";
#endif #endif
#ifdef LIBTIDY_VERSION
static const char TY_(library_version)[] = LIBTIDY_VERSION;
#else
static const char TY_(library_version)[] = "5.0.0";
#endif
/* eof */