working on more installation functionality

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@240 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/config.py b/config.py
index 233d726b85237c90ae787568e3c303f30bdb91ea..aca2d7a9deb65821950adbf39e157456efe9404b 100644 (file)
--- a/config.py
+++ b/config.py
@@ -13,7 +13,7 @@ import utils
 class Config:
        # not used atm, but useful to keep a list in mind
        # may use them eventually for the 'all' and other aliases expansions?
-       target_choices = utils.Enum( 'radiant', 'q3map2' )
+       target_choices = utils.Enum( 'radiant', 'q3map2', 'setup' )
        config_choices = utils.Enum( 'debug', 'release' )
 
        # aliases
@@ -29,6 +29,11 @@ class Config:
                self.cc = 'gcc'
                self.cxx = 'g++'
                self.install_directory = 'install'
+               
+               # 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' ]
 
        def __repr__( self ):
                return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@@ -48,12 +53,20 @@ class Config:
        def _processInstallDir( self, ops ):
                self.install_directory = os.path.normpath( os.path.expanduser( ops[0] ) )
 
+       def _processSetupPlatforms( self, ops ):
+               self.setup_platforms = ops
+
+       def _processSetupPacks( self, ops ):
+               self.setup_packs = ops
+
        def setupParser( self, operators ):
                operators['target'] = self._processTarget
                operators['config'] = self._processConfig
                operators['cc'] = self._processCC
                operators['cxx'] = self._processCXX
                operators['install_directory'] = self._processInstallDir
+               operators['setup_platforms'] = self._processSetupPlatforms
+               operators['setup_packs'] = self._processSetupPacks
 
        def emit_radiant( self ):
                settings = self
@@ -167,6 +180,13 @@ class Config:
                else:
                        self.emit_q3map2()
 
+               try:
+                       self.target_selected.index( 'setup' )
+               except:
+                       pass
+               else:
+                       self.Setup()
+
        def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False, usePNG = False ):
                env['CC'] = self.cc
                env['CXX'] = self.cxx
@@ -227,9 +247,30 @@ class Config:
                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 = [ '-march=pentium3' ] )
 
-#              env.Append( LINKFLAGS = [ '-m32' ] )
+       def CheckoutOrUpdate( self, svnurl, path ):
+               if ( os.path.exists( path ) ):
+                       # NOTE: check the svnurl matches?
+                       cmd = 'svn update "%s"' % path
+                       print cmd
+               else:
+                       cmd = 'svn checkout %s "%s"' % ( svnurl, path )
+               ret = os.system( cmd )
+               if ( ret != 0 ):
+                       raise 'checkout or update failed'
+                       
+
+       def FetchGamePaks( self, path ):
+               for pak in self.setup_packs:
+                       if ( pak == 'Q3Pack' or pak == 'UrTPack' ):
+                               svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
+                               self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
+
+       def Setup( self ):
+               for platform in self.setup_platforms:
+                       if ( platform == 'local' ):
+                               # special case, fetch external paks under the local install directory
+                               self.FetchGamePaks( self.install_directory )
 
 # 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

diff --git a/install/games/q3ut4/synapse.config b/install/games/q3ut4/synapse.config
new file mode 100644 (file)
index 0000000..58800d4
--- /dev/null
+++ b/install/games/q3ut4/synapse.config
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>\r
+<!-- synapse XML configuration -->\r
+<synapseconfig>\r
+  <client name="core">\r
+    <api name="image">\r
+      tga jpg\r
+    </api>\r
+    <api name="VFS">\r
+      pk3\r
+    </api>\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+    <api name="map">\r
+      mapq3\r
+    </api>\r
+    <api name="eclass">\r
+      def\r
+    </api> \r
+    <api name="surfdialog">\r
+      quake3\r
+    </api>\r
+  </client>\r
+  <client name="image">\r
+    <api name="VFS">\r
+      pk3\r
+    </api>\r
+  </client>\r
+  <client name="shaders">\r
+    <!-- NOTE: this is a SYN_PROVIDE -->\r
+    <api name="shaders">\r
+       quake3\r
+    </api>\r
+    <api name="VFS">\r
+       pk3\r
+    </api>\r
+  </client>\r
+  <client name="map">\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+  </client>\r
+  <client name="xmap">\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+  </client>\r
+  <client name="model">\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+    <api name="VFS">\r
+      pk3\r
+    </api>\r
+  </client>\r
+</synapseconfig>\r

diff --git a/install/games/quake3/synapse.config b/install/games/quake3/synapse.config
new file mode 100644 (file)
index 0000000..58800d4
--- /dev/null
+++ b/install/games/quake3/synapse.config
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>\r
+<!-- synapse XML configuration -->\r
+<synapseconfig>\r
+  <client name="core">\r
+    <api name="image">\r
+      tga jpg\r
+    </api>\r
+    <api name="VFS">\r
+      pk3\r
+    </api>\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+    <api name="map">\r
+      mapq3\r
+    </api>\r
+    <api name="eclass">\r
+      def\r
+    </api> \r
+    <api name="surfdialog">\r
+      quake3\r
+    </api>\r
+  </client>\r
+  <client name="image">\r
+    <api name="VFS">\r
+      pk3\r
+    </api>\r
+  </client>\r
+  <client name="shaders">\r
+    <!-- NOTE: this is a SYN_PROVIDE -->\r
+    <api name="shaders">\r
+       quake3\r
+    </api>\r
+    <api name="VFS">\r
+       pk3\r
+    </api>\r
+  </client>\r
+  <client name="map">\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+  </client>\r
+  <client name="xmap">\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+  </client>\r
+  <client name="model">\r
+    <api name="shaders">\r
+      quake3\r
+    </api>\r
+    <api name="VFS">\r
+      pk3\r
+    </api>\r
+  </client>\r
+</synapseconfig>\r

diff --git a/install/games/synapse.config b/install/games/synapse.config
deleted file mode 100644 (file)
index 58800d4..0000000
--- a/install/games/synapse.config
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes"?>\r
-<!-- synapse XML configuration -->\r
-<synapseconfig>\r
-  <client name="core">\r
-    <api name="image">\r
-      tga jpg\r
-    </api>\r
-    <api name="VFS">\r
-      pk3\r
-    </api>\r
-    <api name="shaders">\r
-      quake3\r
-    </api>\r
-    <api name="map">\r
-      mapq3\r
-    </api>\r
-    <api name="eclass">\r
-      def\r
-    </api> \r
-    <api name="surfdialog">\r
-      quake3\r
-    </api>\r
-  </client>\r
-  <client name="image">\r
-    <api name="VFS">\r
-      pk3\r
-    </api>\r
-  </client>\r
-  <client name="shaders">\r
-    <!-- NOTE: this is a SYN_PROVIDE -->\r
-    <api name="shaders">\r
-       quake3\r
-    </api>\r
-    <api name="VFS">\r
-       pk3\r
-    </api>\r
-  </client>\r
-  <client name="map">\r
-    <api name="shaders">\r
-      quake3\r
-    </api>\r
-  </client>\r
-  <client name="xmap">\r
-    <api name="shaders">\r
-      quake3\r
-    </api>\r
-  </client>\r
-  <client name="model">\r
-    <api name="shaders">\r
-      quake3\r
-    </api>\r
-    <api name="VFS">\r
-      pk3\r
-    </api>\r
-  </client>\r
-</synapseconfig>\r

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index ecd4d0a1d6f895ab095cdb0ff2c385365a473d92..4489205e55f212cc4f84a23332d23c94be2bd02a 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -3244,10 +3244,10 @@ void CGameInstall::Run() {
        }
        fprintf( fg, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" standalone=\"yes\"?>\n<game\n" );
        fprintf( fg, "  name=\"%s\"\n", m_strName.GetBuffer() );
-       fprintf( fg, "  gametools=\"%sgames/%s\"\n", g_strAppPath.GetBuffer(), m_strName.GetBuffer() );
        fprintf( fg, "  enginepath=\"%s\"\n", m_strEngine.GetBuffer() );
        switch ( m_availGames[ m_nComboSelect ] ) {
        case GAME_Q2: {
+               fprintf( fg, "  gametools=\"%sgames/quake2\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".quake2\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";
@@ -3258,6 +3258,7 @@ void CGameInstall::Run() {
                break;
        }
        case GAME_Q3: {
+               fprintf( fg, "  gametools=\"%sgames/quake3\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".q3a\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";
@@ -3268,6 +3269,7 @@ void CGameInstall::Run() {
                break;
        }
        case GAME_URT: {
+               fprintf( fg, "  gametools=\"%sgames/q3ut4\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".q3a\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";
@@ -3278,6 +3280,7 @@ void CGameInstall::Run() {
                break;
        }
        case GAME_UFOAI: {
+               fprintf( fg, "  gametools=\"%sgames/ufoai\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".ufoai\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";
@@ -3288,6 +3291,7 @@ void CGameInstall::Run() {
                break;
        }
        case GAME_Q2W: {
+               fprintf( fg, "  gametools=\"%sgames/q2w\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".quake2world\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";
@@ -3298,6 +3302,7 @@ void CGameInstall::Run() {
                break;
        }
        case GAME_WARSOW: {
+               fprintf( fg, "  gametools=\"%sgames/warsow\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".warsow\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";
@@ -3308,6 +3313,7 @@ void CGameInstall::Run() {
                break;
        }
        case GAME_NEXUIZ: {
+               fprintf( fg, "  gametools=\"%sgames/nexuiz\"\n", g_strAppPath.GetBuffer() );
                fprintf( fg, "  prefix=\".nexuiz\"\n" );
                Str source = g_strAppPath.GetBuffer();
                source += "installs/";