X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=config.py;h=f55b7bfa14860159c05ea6df74b155fc37d30b5b;hb=3311b00ae6f150aec8629b860f28c4bf92abef33;hp=e0f20a01e52271274abd64a2aa3d6b8284f29836;hpb=1f99ab9e8117ed0772e58360c8b459961cbb0576;p=xonotic%2Fnetradiant.git diff --git a/config.py b/config.py index e0f20a01..f55b7bfa 100644 --- a/config.py +++ b/config.py @@ -33,7 +33,7 @@ class Config: # 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', 'JAPack' ] + self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack', 'ReactionPack' ] def __repr__( self ): return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected ) @@ -76,10 +76,9 @@ class Config: config['shared'] = False 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?) + VariantDir( build_dir, '.', duplicate = 0 ) 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' ) @@ -88,13 +87,13 @@ class Config: # 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 Export( 'project', 'config' ) build_dir = os.path.join( 'build', config_name, 'shobjs' ) - BuildDir( build_dir, '.', duplicate = 0 ) + VariantDir( build_dir, '.', duplicate = 0 ) shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) for project in [ 'plugins/vfspk3/vfspk3.vcproj', @@ -106,10 +105,10 @@ class Config: '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', @@ -117,32 +116,35 @@ class Config: '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' ) ) @@ -156,9 +158,9 @@ class Config: config['shared'] = False Export( 'utils', 'settings', 'config' ) build_dir = os.path.join( 'build', config_name, 'q3map2' ) - BuildDir( build_dir, '.', duplicate = 0 ) + VariantDir( 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_VC9.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' ) @@ -245,8 +247,9 @@ class Config: 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' ] ) + # '-O' causes q3map2 errors on Ubuntu 10.10 32 bit. + env.Append( CFLAGS = [ ] ) + env.Append( CXXFLAGS = [ ] ) def CheckoutOrUpdate( self, svnurl, path ): if ( os.path.exists( path ) ): @@ -259,8 +262,8 @@ class Config: def FetchGamePaks( self, path ): for pak in self.setup_packs: - 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 + if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'ReactionPack' ): + svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) ) def Setup( self ): @@ -273,60 +276,71 @@ class Config: 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' - if ( not os.path.exists( depsfile ) ): - cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile ] + 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://icculus.org/gtkradiant/files/1.6.2/%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 ) - - # extract one directoy above - f = os.path.abspath( depsfile ) - backup_cwd = os.getcwd() - os.chdir( os.path.dirname( backup_cwd ) ) - cmd = [ 'unzip', '-o', f ] + 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 ) - 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/libpangoft2-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', - 'gtk2/zlib1.dll', -# 'freetype-dev_2.4.2-1_win32/bin/freetype6.dll', -# 'fontconfig-dev_2.8.0-2_win32/bin/libfontconfig-1.dll', -# 'expat_2.0.1-1_win32/bin/libexpat-1.dll', - ]: - cmd = [ 'cp', '-v', os.path.join( srcdir, f ), 'install' ] - print( repr( cmd ) ) - subprocess.check_call( cmd ) - for d in [ - 'gtk2/etc', - 'gtk2/share', -# 'fontconfig-dev_2.8.0-2_win32/etc', -# 'fontconfig-dev_2.8.0-2_win32/share', -# 'freetype-dev_2.4.2-1_win32/share', - ]: - 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