-import sys, traceback, platform, re, commands, platform
+import sys, traceback, platform, re, commands, platform, subprocess
if __name__ != '__main__':
from SCons.Script import *
# platforms for which to assemble a setup
self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
# paks to assemble in the setup
- self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack' ]
+ self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack', 'JAPack' ]
def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
build_dir = os.path.join( 'build', config_name, 'q3map2' )
BuildDir( build_dir, '.', duplicate = 0 )
lib_objects = []
- for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
+ for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib_VC9.vcproj' ]:
Export( 'project' )
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
def CheckoutOrUpdate( self, svnurl, path ):
if ( os.path.exists( path ) ):
- # NOTE: check the svnurl matches?
- cmd = 'svn update "%s"' % path
- print cmd
+ cmd = [ 'svn', 'update', path ]
else:
- cmd = 'svn checkout %s "%s"' % ( svnurl, path )
- ret = os.system( cmd )
- if ( ret != 0 ):
- raise Exception( 'checkout or update failed' )
+ cmd = [ 'svn', 'checkout', svnurl, path ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
def FetchGamePaks( self, path ):
for pak in self.setup_packs:
- if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' ):
+ if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'JAPack' ):
svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
self.FetchGamePaks( self.install_directory )
# NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them
if ( self.platform == 'Windows' ):
- depsfile = 'GtkR-deps-1.6-3.zip'
- # TMP
- #if ( not os.path.exists( depsfile ) ):
- if ( True ):
- cmd = 'wget http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile
- print cmd
- ret = os.system( cmd )
- if ( ret != 0 ):
- raise Exception( 'Failed to download dependencies file' )
+ depsfile = 'GtkR-deps-1.6-5.zip'
+ if ( not os.path.exists( depsfile ) ):
+ cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
# extract one directoy above
f = os.path.abspath( depsfile )
backup_cwd = os.getcwd()
os.chdir( os.path.dirname( backup_cwd ) )
- cmd = 'unzip %s' % f
- print cmd
- ret = os.system( cmd )
- if ( ret != 0 ):
- raise Exception( 'unzip dependencies file failed' )
+ cmd = [ 'unzip', '-o', f ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
os.chdir( backup_cwd )
# copy all the dependent runtime data to the install directory
srcdir = os.path.dirname( backup_cwd )
for f in [
+ # USE THE DEPENDENCY WALKER
+ # tier 1: radiant.exe direct deps
+ # tier 2: deps of tier 1 DLLs
+ # etc.
+ # tier 1
'libxml2/bin/libxml2.dll',
+ 'libxml2/bin/iconv.dll',
'gtk2/bin/libglib-2.0-0.dll',
'gtk2/bin/libgobject-2.0-0.dll',
'gtk2/bin/libgdk-win32-2.0-0.dll',
'gtk2/bin/libgtk-win32-2.0-0.dll',
'gtk2/bin/intl.dll',
- 'gtk2/bin/libatk-1.0-0.dll',
+ 'gtk2/bin/libpango-1.0-0.dll',
+ 'gtk2/bin/libpangoft2-1.0-0.dll',
+ 'gtk2/lib/gtkglext-1.2.0/lib/libgtkglext-win32-1.0-0.dll',
+ 'gtk2/lib/gtkglext-1.2.0/lib/libgdkglext-win32-1.0-0.dll',
+ # tier 2
+ 'gtk2/bin/libgthread-2.0-0.dll',
'gtk2/bin/libcairo-2.dll',
'gtk2/bin/libgdk_pixbuf-2.0-0.dll',
- 'gtk2/bin/libgmodule-2.0-0.dll',
- 'gtk2/bin/libpng13.dll',
- 'gtk2/bin/libpango-1.0-0.dll',
'gtk2/bin/libpangocairo-1.0-0.dll',
'gtk2/bin/libpangowin32-1.0-0.dll',
- 'gtk2/lib/libgtkglext-win32-1.0-0.dll',
- 'gtk2/lib/libgdkglext-win32-1.0-0.dll',
- 'gtk2/lib/iconv.dll', ]:
- cmd = 'cp -v "%s" installs' % os.path.join( srcdir, f )
- print cmd
- ret = os.system( cmd )
- if ( ret != 0 ):
- raise Exception( 'runtime file copy failed' )
+ 'gtk2/bin/libatk-1.0-0.dll',
+ 'gtk2/bin/libgmodule-2.0-0.dll',
+ 'gtk2/bin/libfontconfig-1.dll',
+ 'gtk2/bin/freetype6.dll',
+ # tier 3
+ 'gtk2/bin/libexpat-1.dll',
+ 'gtk2/bin/libpng14-14.dll',
+ 'gtk2/bin/zlib1.dll',
+ 'gtk2/bin/libgio-2.0-0.dll',
+ ]:
+ cmd = [ 'cp', '-v', os.path.join( srcdir, f ), 'install' ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
for d in [
'gtk2/etc',
'gtk2/share',
]:
- cmd = 'cp -r -v "%s" install' % os.path.join( srcdir, d )
- print cmd
- ret = os.system( cmd )
- if ( ret != 0 ):
- raise Exception( 'runtime directory copy failed' )
+ cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, d ), 'install' ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
# parse the config statement line to produce/update an existing config list
# the configs expose a list of keywords and accepted values, which the engine parses out
projects / xonotic / netradiant.git / blobdiff