diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7092e..91c61a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ include(GNUInstallDirs) ################################ # set lib version here -set(GENERIC_LIB_VERSION "2.1.0") -set(GENERIC_LIB_SOVERSION "2") +set(GENERIC_LIB_VERSION "2.2.0") +set(GENERIC_LIB_SOVERSION "2") ################################ diff --git a/dox b/dox index 3fc0aaa..75385e1 100644 --- a/dox +++ b/dox @@ -38,7 +38,7 @@ PROJECT_NAME = "TinyXML-2" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.1.0 +PROJECT_NUMBER = 2.2.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/setversion.py b/setversion.py index 12fc7df..85523d7 100755 --- a/setversion.py +++ b/setversion.py @@ -116,6 +116,8 @@ print( "Release note:" ) print( '1. Build. g++ -Wall -DDEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe' ) print( '2. Commit. git commit -am"setting the version to ' + versionStr + '"' ) print( '3. Tag. git tag ' + versionStr ) -print( ' OR git tag -a ' + versionStr + ' -m ' ) -print( 'Remember to "git push" both code and tag.' ) +print( ' OR git tag -a ' + versionStr + ' -m [tag message]' ) +print( 'Remember to "git push" both code and tag. For the tag:' ) +print( 'git push origin [tagname]') + \ No newline at end of file diff --git a/tinyxml2.h b/tinyxml2.h index 608e41f..1fdc928 100755 --- a/tinyxml2.h +++ b/tinyxml2.h @@ -122,9 +122,9 @@ inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) /* Versioning, past 1.0.14: http://semver.org/ */ -static const int TIXML2_MAJOR_VERSION = 2; -static const int TIXML2_MINOR_VERSION = 1; -static const int TIXML2_PATCH_VERSION = 0; +static const int TIXML2_MAJOR_VERSION = 2; +static const int TIXML2_MINOR_VERSION = 2; +static const int TIXML2_PATCH_VERSION = 0; namespace tinyxml2 {