mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-21 15:41:35 +02:00
Code Issues Projects Releases Wiki Activity

make print statements python 3 compatible

Browse Source
This commit is contained in:
jacob1
2017-10-03 21:14:16 -04:00
parent 17c9340434
commit 1c275e943f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SConscript
View File

@@ -21,9 +21,9 @@ class ourSpawn:
data, err = proc.communicate() data, err = proc.communicate()
rv = proc.wait() rv = proc.wait()
if rv: if rv:
print "=====" print("=====")
print err print(err)
print "=====" print("=====")
return rv return rv
def SetupSpawn(env): def SetupSpawn(env):
buf = ourSpawn() buf = ourSpawn()
@@ -137,7 +137,7 @@ if tool:
for var in ["CC","CXX","LD","LIBPATH","STRIP"]: for var in ["CC","CXX","LD","LIBPATH","STRIP"]:
if var in os.environ: if var in os.environ:
env[var] = os.environ[var] env[var] = os.environ[var]
print "copying environment variable {0}={1!r}".format(var,os.environ[var]) print("copying environment variable {0}={1!r}".format(var,os.environ[var]))
# variables containing several space separated things # variables containing several space separated things
for var in ["CFLAGS","CCFLAGS","CXXFLAGS","LINKFLAGS","CPPDEFINES","CPPPATH"]: for var in ["CFLAGS","CCFLAGS","CXXFLAGS","LINKFLAGS","CPPDEFINES","CPPPATH"]:
if var in os.environ: if var in os.environ:
@@ -145,7 +145,7 @@ for var in ["CFLAGS","CCFLAGS","CXXFLAGS","LINKFLAGS","CPPDEFINES","CPPPATH"]:
env[var] += SCons.Util.CLVar(os.environ[var]) env[var] += SCons.Util.CLVar(os.environ[var])
else: else:
env[var] = SCons.Util.CLVar(os.environ[var]) env[var] = SCons.Util.CLVar(os.environ[var])
print "copying environment variable {0}={1!r}".format(var,os.environ[var]) print("copying environment variable {0}={1!r}".format(var,os.environ[var]))
#Used for intro text / executable name, actual bit flags are only set if the --64bit/--32bit command line args are given #Used for intro text / executable name, actual bit flags are only set if the --64bit/--32bit command line args are given
def add32bitflags(env): def add32bitflags(env):
@@ -377,7 +377,7 @@ if GetOption('clean'):
try: try:
shutil.rmtree("generated/") shutil.rmtree("generated/")
except: except:
print "couldn't remove build/generated/" print("couldn't remove build/generated/")
elif not GetOption('help'): elif not GetOption('help'):
conf = Configure(env) conf = Configure(env)
conf.AddTest('CheckFramework', CheckFramework) conf.AddTest('CheckFramework', CheckFramework)

6
SConstruct
View File

@@ -9,14 +9,14 @@ if GetOption('clean'):
try: try:
shutil.rmtree(".sconf_temp/") shutil.rmtree(".sconf_temp/")
except: except:
print "couldn't remove .sconf_temp/" print("couldn't remove .sconf_temp/")
try: try:
shutil.rmtree("generated/") shutil.rmtree("generated/")
except: except:
print "couldn't remove generated/" print("couldn't remove generated/")
try: try:
os.remove(".sconsign.dblite") os.remove(".sconsign.dblite")
except: except:
print "couldn't remove .sconsign.dblite" print("couldn't remove .sconsign.dblite")