Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37749797
en ru br
Репозитории ALT
S:0.9.8083-alt9
5.1: 0.9.8083-alt0.M51.2
4.1: 0.6.5069-alt1.qa1
www.altlinux.org/Changes

Группа :: Игры/Аркады
Пакет: btanks

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: btanks-py3-scons.patch
Скачать


diff --git a/SConstruct b/SConstruct
index ee6ab3c..2bb8a03 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,15 +47,15 @@ debug = buildmode == "debug"
 Export('debug')
 
 import SCons.Util
-if os.environ.has_key('CC'):
+if 'CC' in os.environ:
 	env['CC'] = os.environ['CC']
-if os.environ.has_key('CFLAGS'):
+if 'CFLAGS' in os.environ:
 	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-if os.environ.has_key('CXX'):
+if 'CXX' in os.environ:
 	env['CXX'] = os.environ['CXX']
-if os.environ.has_key('CXXFLAGS'):
+if 'CXXFLAGS' in os.environ:
 	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-if os.environ.has_key('LDFLAGS'):
+if 'LDFLAGS' in os.environ:
 	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
 
 if (sys.platform != "win32" and env['gcc_visibility']): 
@@ -163,7 +163,7 @@ Export('have_sse')
 lib_dir = '.'
 plugins_dir = ''
 try : 
-	version_file = file('.svnversion', 'r')
+	version_file = open('.svnversion', 'r')
 	try : 
 		version = version_file.readline().strip()
 		prefix = env['prefix']
@@ -191,7 +191,7 @@ try :
 
 	except: 
 		info = sys.exc_info()
-		print "%s %s %s" %(info[0], info[1], info[2])
+		print("%s %s %s" %(info[0], info[1], info[2]))
 except : 
 	svnversion = os.popen('svnversion -n .', 'r')
 	version = svnversion.readline().strip()
@@ -232,29 +232,29 @@ Export('lib_dir')
 Export('plugins_dir')
 
 version = '0.9.%s' %version
-print "version: %s" %version
+print("version: %s" %version)
 
 bt_sublibs = ['mrt', 'sdlx', 'objects', 'clunk']
 env.Append(CPPPATH=['#'])
 
 if (os.path.exists('private')):
 	dir = 'private'
-	BuildDir('#/build/' + buildmode + '/' + dir, dir, 0)
+	VariantDir('#/build/' + buildmode + '/' + dir, dir, 0)
 	SConscript('#/build/' + buildmode + '/' + dir + '/SConscript')	
 
 for dir in bt_sublibs:
-	BuildDir('#/build/' + buildmode + '/' + dir, dir, 0)
+	VariantDir('#/build/' + buildmode + '/' + dir, dir, 0)
 	SConscript('#/build/' + buildmode + '/' + dir + '/SConscript')
 
 for dir in bt_sublibs:
 	env.Append(LIBPATH=['#/build/' + buildmode + '/' + dir])
 
-env.BuildDir('#/build/' + buildmode + '/editor', 'editor', 0)
+env.VariantDir('#/build/' + buildmode + '/editor', 'editor', 0)
 SConscript('#/build/' + buildmode + '/editor/SConscript')
 
 env.Append(LIBPATH=['#/build/' + buildmode + '/engine'])
 
-env.BuildDir('#/build/' + buildmode + '/engine', 'engine', 0)
+env.VariantDir('#/build/' + buildmode + '/engine', 'engine', 0)
 SConscript('#/build/' + buildmode + '/engine/' + 'SConscript')
 
 if len(install_targets) > 0:
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin