-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', 'ReactionPack' ]
def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
Export( 'utils', 'settings', 'config' )
build_dir = os.path.join( 'build', config_name, 'radiant' )
BuildDir( build_dir, '.', duplicate = 0 )
- # left out jpeg6, splines (FIXME: I think jpeg6 is not used at all, can trash?)
lib_objects = []
- for project in [ 'libs/synapse/synapse.vcproj', '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/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj' ]:
Export( 'project' )
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
# PIC versions of the libs for the modules
shlib_objects_extra = {}
- for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj' ]:
+ for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/splines/splines.vcproj' ]:
( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0]
config['shared'] = True
'plugins/model/model.vcproj',
'plugins/imagepng/imagepng.vcproj',
'plugins/imagewal/imagewal.vcproj',
+ 'plugins/imagehl/imagehl.vcproj',
'plugins/imagem8/imagem8.vcproj',
'plugins/spritemodel/spritemodel.vcproj',
- 'plugins/textool/TexTool.vcproj',
- # 'plugins/sample/sample.vcproj',
+ 'plugins/textool/textool.vcproj',
'plugins/map/map.vcproj',
'plugins/mapxml/mapxml.vcproj',
'plugins/shaders/shaders.vcproj',
'plugins/surface_ufoai/surface_ufoai.vcproj',
'plugins/surface_quake2/surface_quake2.vcproj',
'plugins/surface_heretic2/surface_heretic2.vcproj',
- # FIXME Needs splines
- # 'contrib/camera/camera.vcproj',
-
- # FIXME What is this? Empty dir for me - remove me?
- # 'contrib/patches/patches.vcproj',
- # 'plugins/archivewad/archivewad.vcproj',
-
- 'contrib/prtview/PrtView.vcproj',
+ 'contrib/camera/camera.vcproj',
+ 'contrib/prtview/prtview.vcproj',
'contrib/hydratoolz/hydratoolz.vcproj',
- 'contrib/bobtoolz/bobToolz_gtk.vcproj',
+ 'contrib/bobtoolz/bobtoolz.vcproj',
'contrib/gtkgensurf/gtkgensurf.vcproj',
'contrib/ufoai/ufoai.vcproj',
'contrib/bkgrnd2d/bkgrnd2d.vcproj'
]:
( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0]
- shlib_objects = shlib_objects_extra['synapse']
- if ( libname == 'entity' ):
+ # The old code assigned shlib_objects to shlib_objects_extra['synapse'],
+ # and this resulted in a non-copy. Stuff is added to shlib_objects below.
+ # So we need the explicit copy so we don't modify shlib_objects_extra['synapse'].
+ shlib_objects = shlib_objects_extra['synapse'][:]
+ if ( libname == 'camera' ):
+ shlib_objects += shlib_objects_extra['splines']
+ elif ( libname == 'entity' ):
shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'map' ):
+ shlib_objects += shlib_objects_extra['cmdlib']
elif ( libname == 'model' ):
shlib_objects += shlib_objects_extra['picomodel']
-# elif ( libname == 'spritemodel' ):
-# shlib_objects += shlib_objects_extra['mathlib']
-# elif ( libname == 'TexTool' ):
-# shlib_objects += shlib_objects_extra['mathlib']
- elif ( libname == 'map' ):
+ shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'spritemodel' ):
+ shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'textool' ):
+ shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'bobtoolz' ):
+ shlib_objects += shlib_objects_extra['mathlib']
shlib_objects += shlib_objects_extra['cmdlib']
Export( 'project', 'shlib_objects' )
module = SConscript( os.path.join( build_dir, 'SConscript.module' ) )
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 [ 'tools/quake3/common/quake3-common.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
Export( 'project' )
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
env.Append( CXXFLAGS = [ '-g' ] )
env.Append( CPPDEFINES = [ '_DEBUG' ] )
else:
- env.Append( CFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations', '-fno-strict-aliasing' ] )
- env.Append( CXXFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations','-fno-strict-aliasing' ] )
+ env.Append( CFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
+ env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
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 == 'ReactionPack' ):
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' )
-
- # 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' )
- os.chdir( backup_cwd )
-
- # copy all the dependent runtime data to the install directory
- srcdir = os.path.dirname( backup_cwd )
- for f in [
- 'libxml2/bin/libxml2.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/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' )
- 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' )
+ backup_cwd = os.getcwd()
+ for lib_archive in [
+ 'gtk+-bundle-2.16.6-20100912-3-win32.zip',
+ 'gtkglext-1.2.0-3-win32.zip',
+ 'libxml2-2.7.3-2-win32.zip',
+ 'jpeg-8c-4-win32.zip',
+ 'STLport-5.2.1-4.zip'
+ ]:
+ if ( not os.path.exists( lib_archive ) ):
+ cmd = [ 'wget', '-N', 'http://porky.nerius.com/radiant-libs-win32/%s' % lib_archive ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
+ lib_archive_path = os.path.abspath( lib_archive )
+ os.chdir( os.path.dirname( backup_cwd ) )
+ cmd = [ 'unzip', '-o', lib_archive_path ]
+ 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 dll in [
+ 'gtk-2.16.6/bin/freetype6.dll',
+ 'gtk-2.16.6/bin/intl.dll',
+ 'gtk-2.16.6/bin/libasprintf-0.dll',
+ 'gtk-2.16.6/bin/libatk-1.0-0.dll',
+ 'gtk-2.16.6/bin/libcairo-2.dll',
+ 'gtk-2.16.6/bin/libexpat-1.dll',
+ 'gtk-2.16.6/bin/libfontconfig-1.dll',
+ 'gtk-2.16.6/bin/libgailutil-18.dll',
+ 'gtk-2.16.6/bin/libgcc_s_dw2-1.dll',
+ 'gtk-2.16.6/bin/libgdk-win32-2.0-0.dll',
+ 'gtk-2.16.6/bin/libgdk_pixbuf-2.0-0.dll',
+ 'gtk-2.16.6/bin/libgio-2.0-0.dll',
+ 'gtk-2.16.6/bin/libglib-2.0-0.dll',
+ 'gtk-2.16.6/bin/libgmodule-2.0-0.dll',
+ 'gtk-2.16.6/bin/libgobject-2.0-0.dll',
+ 'gtk-2.16.6/bin/libgthread-2.0-0.dll',
+ 'gtk-2.16.6/bin/libgtk-win32-2.0-0.dll',
+ 'gtk-2.16.6/bin/libpango-1.0-0.dll',
+ 'gtk-2.16.6/bin/libpangocairo-1.0-0.dll',
+ 'gtk-2.16.6/bin/libpangoft2-1.0-0.dll',
+ 'gtk-2.16.6/bin/libpangowin32-1.0-0.dll',
+ 'gtk-2.16.6/bin/libpng14-14.dll',
+ 'gtk-2.16.6/bin/zlib1.dll',
+ 'gtk-2.16.6/lib/GNU.Gettext.dll',
+ 'gtk-2.16.6/lib/gtk-2.0/2.10.0/engines/libpixmap.dll',
+ 'gtk-2.16.6/lib/gtk-2.0/2.10.0/engines/libwimp.dll',
+ 'gtk-2.16.6/lib/gtk-2.0/modules/libgail.dll',
+ 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll',
+ 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll',
+ 'libxml2-2.7.3/bin/libxml2-2.dll'
+ ]:
+ cmd = [ 'cp', '-v', os.path.join( srcdir, dll ), 'install' ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
+ for extra in [
+ 'gtk-2.16.6/etc',
+ 'gtk-2.16.6/share',
+ 'gtkglext-1.2.0/share',
+ 'libxml2-2.7.3/share'
+ ]:
+ cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, extra ), '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