Merge remote-tracking branch 'github/master'

1 files changed, 14 insertions, 15 deletions

diff --git a/setversion.py b/setversion.py
index 11b2e75..ea5590e 100755
--- a/setversion.py
+++ b/setversion.py
@@ -26,7 +26,6 @@ def fileProcess( name, lineFunction ):
 	filestream.write( output );

 	filestream.close()

 	

-	

 def echoInput( line ):

 	return line

 

@@ -40,8 +39,8 @@ minor = args[1]
 build = args[2]

 versionStr = major + "." + minor + "." + 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 ####

 

@@ -52,16 +51,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;

@@ -76,8 +75,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;

@@ -92,8 +91,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;

@@ -105,8 +104,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;