apply back 335 and 336, will need to update deps and put a zip out

[xonotic/netradiant.git] / config.py

diff --git a/config.py b/config.py
index 30f623df25ef6e42645593f26b327611757afeea..ad7ad9e924ec12074a2f1e3dc852ef9eb3ad67ab 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,4 +1,4 @@
-import sys, traceback, platform, re, commands, platform
+import sys, traceback, platform, re, commands, platform, subprocess
 
 if __name__ != '__main__':
        from SCons.Script import *
@@ -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' ]
+               self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack', 'JAPack' ]
 
        def __repr__( self ):
                return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@@ -158,7 +158,7 @@ class Config:
                        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' )
@@ -250,19 +250,16 @@ class Config:
 
        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 ) )