diff --git a/CMakeLists.txt b/CMakeLists.txt index 12cac92..67716fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ include(GNUInstallDirs) ################################ # set lib version here -set(GENERIC_LIB_VERSION "1.0.14") -set(GENERIC_LIB_SOVERSION "1") +set(GENERIC_LIB_VERSION "1.1.0") +set(GENERIC_LIB_SOVERSION "1") ################################ diff --git a/dox b/dox index 10878f4..bfd90aa 100755 --- a/dox +++ b/dox @@ -32,7 +32,7 @@ PROJECT_NAME = "TinyXML-2" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.0.14 +PROJECT_NUMBER = 1.1.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 diff --git a/setversion.py b/setversion.py index a72ee03..b8c4472 100755 --- a/setversion.py +++ b/setversion.py @@ -33,8 +33,8 @@ major = input( "Major: " ) minor = input( "Minor: " ) build = input( "Build: " ) -print "Setting dox,tinyxml2.h" -print "Version: " + `major` + "." + `minor` + "." + `build` +print ("Setting dox,tinyxml2.h") +print ("Version: " + major + "." + minor + "." + build) #### Write the tinyxml.h #### @@ -45,16 +45,16 @@ def engineRule( line ): matchBuild = "static const int TIXML2_PATCH_VERSION" if line[0:len(matchMajor)] == matchMajor: - print "1)tinyxml2.h Major found" - return matchMajor + " = " + `major` + ";\n" + print( "1)tinyxml2.h Major found" ) + return matchMajor + " = " + major + ";\n" elif line[0:len(matchMinor)] == matchMinor: - print "2)tinyxml2.h Minor found" - return matchMinor + " = " + `minor` + ";\n" + print( "2)tinyxml2.h Minor found" ) + return matchMinor + " = " + minor + ";\n" elif line[0:len(matchBuild)] == matchBuild: - print "3)tinyxml2.h Build found" - return matchBuild + " = " + `build` + ";\n" + print( "3)tinyxml2.h Build found" ) + return matchBuild + " = " + build + ";\n" else: return line; @@ -69,8 +69,8 @@ def doxRule( line ): match = "PROJECT_NUMBER" if line[0:len( match )] == match: - print "dox project found" - return "PROJECT_NUMBER = " + `major` + "." + `minor` + "." + `build` + "\n" + print( "dox project found" ) + return "PROJECT_NUMBER = " + major + "." + minor + "." + build + "\n" else: return line; @@ -85,8 +85,8 @@ def cmakeRule1( line ): matchVersion = "set(GENERIC_LIB_VERSION" if line[0:len(matchVersion)] == matchVersion: - print "1)tinyxml2.h Major found" - return matchVersion + " \"" + `major` + "." + `minor` + "." + `build` + "\")" + "\n" + print( "1)tinyxml2.h Major found" ) + return matchVersion + " \"" + major + "." + minor + "." + build + "\")" + "\n" else: return line; @@ -98,8 +98,8 @@ def cmakeRule2( line ): matchSoversion = "set(GENERIC_LIB_SOVERSION" if line[0:len(matchSoversion)] == matchSoversion: - print "1)tinyxml2.h Major found" - return matchSoversion + " \"" + `major` + "\")" + "\n" + print( "1)tinyxml2.h Major found" ) + return matchSoversion + " \"" + major + "\")" + "\n" else: return line;