Changeset 240

Timestamp:

04/05/08 16:38:49 (3 months ago)

Author:

timo

Message:

working on more installation functionality

Files:

• GtkRadiant/branches/ZeroRadiant/config.py (modified) (6 diffs)
• GtkRadiant/branches/ZeroRadiant/install/games/q3ut4 (added)
• GtkRadiant/branches/ZeroRadiant/install/games/q3ut4/synapse.config (added)
• GtkRadiant/branches/ZeroRadiant/install/games/quake3 (added)
• GtkRadiant/branches/ZeroRadiant/install/games/quake3/synapse.config (added)
• GtkRadiant/branches/ZeroRadiant/install/games/synapse.config (deleted)
• GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp (modified) (7 diffs)

GtkRadiant/branches/ZeroRadiant/config.py

@@ -14 +14 @@
-        # not used atm, but useful to keep a list in mind
-        # may use them eventually for the 'all' and other aliases expansions?
-
+, 'setup'
-        config_choices = utils.Enum( 'debug', 'release' )
-
@@ -30 +30 @@
-                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 ):
@@ -48 +53 @@
-        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 ):
@@ -55 +66 @@
-                operators['cxx'] = self._processCXX
-                operators['install_directory'] = self._processInstallDir
+                operators['setup_platforms'] = self._processSetupPlatforms
+                operators['setup_packs'] = self._processSetupPacks
-
-        def emit_radiant( self ):
@@ -168 +181 @@
-                        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
@@ -228 +248 @@
-                        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' ] )
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# parse the config statement line to produce/update an existing config list

GtkRadiant/branches/ZeroRadiant/radiant/preferences.cpp

@@ -3245 +3245 @@
-        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();
@@ -3259 +3259 @@
-        }
-        case GAME_Q3: {
+                fprintf( fg, "  gametools=\"%sgames/quake3\"\n", g_strAppPath.GetBuffer() );
-                fprintf( fg, "  prefix=\".q3a\"\n" );
-                Str source = g_strAppPath.GetBuffer();
@@ -3269 +3270 @@
-        }
-        case GAME_URT: {
+                fprintf( fg, "  gametools=\"%sgames/q3ut4\"\n", g_strAppPath.GetBuffer() );
-                fprintf( fg, "  prefix=\".q3a\"\n" );
-                Str source = g_strAppPath.GetBuffer();
@@ -3279 +3281 @@
-        }
-        case GAME_UFOAI: {
+                fprintf( fg, "  gametools=\"%sgames/ufoai\"\n", g_strAppPath.GetBuffer() );
-                fprintf( fg, "  prefix=\".ufoai\"\n" );
-                Str source = g_strAppPath.GetBuffer();
@@ -3289 +3292 @@
-        }
-        case GAME_Q2W: {
+                fprintf( fg, "  gametools=\"%sgames/q2w\"\n", g_strAppPath.GetBuffer() );
-                fprintf( fg, "  prefix=\".quake2world\"\n" );
-                Str source = g_strAppPath.GetBuffer();
@@ -3299 +3303 @@
-        }
-        case GAME_WARSOW: {
+                fprintf( fg, "  gametools=\"%sgames/warsow\"\n", g_strAppPath.GetBuffer() );
-                fprintf( fg, "  prefix=\".warsow\"\n" );
-                Str source = g_strAppPath.GetBuffer();
@@ -3309 +3314 @@
-        }
-        case GAME_NEXUIZ: {
+                fprintf( fg, "  gametools=\"%sgames/nexuiz\"\n", g_strAppPath.GetBuffer() );
-                fprintf( fg, "  prefix=\".nexuiz\"\n" );
-                Str source = g_strAppPath.GetBuffer();