Fix for issue #491 - added import for print_function, changed all occurences of print to a function

This commit is contained in:
Wintersmith 2018-06-20 21:44:24 +01:00
parent 569fd05954
commit ded17c6cd6
2 changed files with 24 additions and 24 deletions

View File

@ -19,12 +19,12 @@
# limitations under the License.
#
from __future__ import print_function
import sys
if len(sys.argv) != 2:
print """Usage:
%s [input]""" % sys.argv[0]
print( """Usage:
%s [input]""" % sys.argv[0] )
sys.exit()
csproj = sys.argv[1]
@ -34,20 +34,20 @@ from xml.dom.minidom import parse
try:
dom = parse(csproj)
except:
print "ERROR: Unable to open CSProj file %s" % csproj
print( "ERROR: Unable to open CSProj file %s" % csproj )
sys.exit()
outputType = dom.getElementsByTagName("OutputType")[0].childNodes[0].data
assemblyName = dom.getElementsByTagName("AssemblyName")[0].childNodes[0].data
if outputType == "Exe":
print "define(`GENTARGET', `bin/%s.exe')dnl" % assemblyName
print "define(`GENOUTPUTTYPE', `exe')dnl"
print( "define(`GENTARGET', `bin/%s.exe')dnl" % assemblyName )
print( "define(`GENOUTPUTTYPE', `exe')dnl" )
elif outputType == "Library":
print "define(`GENTARGET', `bin/%s.dll')dnl" % assemblyName
print "define(`GENOUTPUTTYPE', `library')dnl"
print( "define(`GENTARGET', `bin/%s.dll')dnl" % assemblyName )
print( "define(`GENOUTPUTTYPE', `library')dnl" )
else:
print "ERROR: Unable to determine output type"
print( "ERROR: Unable to determine output type" )
sys.exit()
sources = [node.getAttribute("Include").replace('\\', '/') for node in
@ -55,5 +55,5 @@ sources = [node.getAttribute("Include").replace('\\', '/') for node in
assemblies = [node.getAttribute("Include") for node in
dom.getElementsByTagName("Reference")]
print "define(`GENSOURCES', `%s')dnl" % ' '.join(sources)
print "define(`GENREFERENCES', `%s')dnl" % ','.join(assemblies)
print( "define(`GENSOURCES', `%s')dnl" % ' '.join(sources) )
print( "define(`GENREFERENCES', `%s')dnl" % ','.join(assemblies) )

View File

@ -19,12 +19,12 @@
# limitations under the License.
#
from __future__ import print_function
import sys
if len(sys.argv) != 2:
print """Usage:
%s [input]""" % sys.argv[0]
print( """Usage:
%s [input]""" % sys.argv[0] )
sys.exit()
vcxproj = sys.argv[1]
@ -34,7 +34,7 @@ from xml.dom.minidom import parse
try:
dom = parse(vcxproj)
except:
print "ERROR: Unable to open VCXProj file %s" % vcxproj
print( "ERROR: Unable to open VCXProj file %s" % vcxproj )
sys.exit()
# We need to find out what kind of project/configuration we're going
@ -49,19 +49,19 @@ for group in groups:
configType = ctnodes[0].childNodes[0].data
break
print "define(`GENCONFIGTYPE', `%s')dnl" % configType
print( "define(`GENCONFIGTYPE', `%s')dnl" % configType )
if configType == "StaticLibrary":
print "define(`GENTARGET', `lib/lib`'GENNAME.a')dnl"
print "define(`GENOUTDIR', `lib')dnl"
print( "define(`GENTARGET', `lib/lib`'GENNAME.a')dnl" )
print( "define(`GENOUTDIR', `lib')dnl" )
elif configType == "DynamicLibrary":
print "define(`GENTARGET', `lib/lib`'GENNAME.$(DLEXT)')dnl"
print "define(`GENOUTDIR', `lib')dnl"
print( "define(`GENTARGET', `lib/lib`'GENNAME.$(DLEXT)')dnl" )
print( "define(`GENOUTDIR', `lib')dnl" )
elif configType == "Application":
print "define(`GENTARGET', `bin/'`GENNAME')dnl"
print "define(`GENOUTDIR', `bin')dnl"
print( "define(`GENTARGET', `bin/'`GENNAME')dnl" )
print( "define(`GENOUTDIR', `bin')dnl" )
else:
print "ERROR: Unable to determine configuration type"
print( "ERROR: Unable to determine configuration type" )
sys.exit()
sources = [node.getAttribute("Include").replace('\\', '/') for node in
@ -70,4 +70,4 @@ sources = [node.getAttribute("Include").replace('\\', '/') for node in
dom.getElementsByTagName("ClInclude")
if not node.getElementsByTagName("ExcludedFromBuild") and node.hasAttribute("Include")]
print "define(`GENSOURCES', `%s')dnl" % ' '.join(sorted(sources))
print( "define(`GENSOURCES', `%s')dnl" % ' '.join(sorted(sources)) )