[Gtkradiant] r4818 - in GtkRadiant/trunk: . docs/developer
setup/data setup/data/tools setup/linux setup/win32
svn-noreply at zerowing.idsoftware.com
svn-noreply at zerowing.idsoftware.com
Fri Oct 1 14:54:53 CDT 2004
Author: spog
Date: 2004-10-01 14:54:36 -0500 (Fri, 01 Oct 2004)
New Revision: 4818
Removed:
GtkRadiant/trunk/setup/data/baseq3/
GtkRadiant/trunk/setup/data/missionpack/
GtkRadiant/trunk/setup/data/tools/games/
GtkRadiant/trunk/setup/data/tools/q3.game/
GtkRadiant/trunk/setup/data/tools/q3bp.game/
Modified:
GtkRadiant/trunk/SConscript
GtkRadiant/trunk/docs/developer/README
GtkRadiant/trunk/setup/linux/gtkradiant-1.5.0.spec
GtkRadiant/trunk/setup/win32/gtkradiant-1.5.0.xml
GtkRadiant/trunk/setup/win32/q3a_example_maps.xml
Log:
updated installer scripts to use Q3Pack; removed q3-specific data
Modified: GtkRadiant/trunk/SConscript
===================================================================
--- GtkRadiant/trunk/SConscript 2004-10-01 19:51:53 UTC (rev 4817)
+++ GtkRadiant/trunk/SConscript 2004-10-01 19:54:36 UTC (rev 4818)
@@ -672,7 +672,7 @@
# goes in core
DEST = self.SETUP_DIR + '/core/q3.game'
self.system('mkdir -p ' + DEST)
- self.system('cp -R setup/data/tools/q3.game/* ' + DEST)
+ self.system('cp -R games/Q3Pack/tools/q3.game/* ' + DEST)
self.system('cp -R docs/manual/quake3/Team_Arena_Mapping_Help ' + DEST)
self.system('cp -R docs/manual/quake3/New_Teams_For_Q3TA ' + DEST)
self.system('cp -R docs/manual/quake3/Q3AShader_Manual ' + DEST)
@@ -680,67 +680,67 @@
# goes in the game install path
DEST = self.SETUP_DIR + '/q3'
self.system('mkdir -p ' + DEST)
- self.system('cp -R setup/data/baseq3 ' + DEST)
- self.system('cp -R setup/data/missionpack ' + DEST)
+ self.system('cp -R games/Q3Pack/baseq3 ' + DEST)
+ self.system('cp -R games/Q3Pack/missionpack ' + DEST)
# game file
- self.system('cp -R setup/data/tools/games/q3.game ' + self.SETUP_DIR + '/games')
+ self.system('cp -R games/Q3Pack/tools/games/q3.game ' + self.SETUP_DIR + '/games')
def copy_wolf(self):
# binaries
self.system('mkdir -p ' + self.SETUP_BIN_DIR + '/wolf')
if ( self.g_darwin == 0 ):
- self.system('cp ../WolfPack/bin/wolf.game/bspc ' + self.SETUP_BIN_DIR + '/wolf')
+ self.system('cp games/WolfPack/bin/wolf.game/bspc ' + self.SETUP_BIN_DIR + '/wolf')
# goes in core
DEST = self.SETUP_DIR + '/core/wolf.game'
self.system('mkdir -p ' + DEST)
- self.system('cp -R ../WolfPack/docs ' + DEST)
- self.system('cp -R ../WolfPack/bin/wolf.game/* ' + DEST)
+ self.system('cp -R games/WolfPack/docs ' + DEST)
+ self.system('cp -R games/WolfPack/bin/wolf.game/* ' + DEST)
# goes in the game install path
DEST = self.SETUP_DIR + '/wolf/main'
self.system('mkdir -p ' + DEST)
- self.system('cp ../WolfPack/astro-skies.pk3 ' + DEST)
- self.system('cp ../WolfPack/common-astro-spog.pk3 ' + DEST)
- self.system('cp ../WolfPack/lights.pk3 ' + DEST)
- self.system('cp -R ../WolfPack/scripts ' + DEST)
- self.system('cp -R ../WolfPack/maps ' + DEST)
- self.system('cp -R ../WolfPack/models ' + DEST)
+ self.system('cp games/WolfPack/astro-skies.pk3 ' + DEST)
+ self.system('cp games/WolfPack/common-astro-spog.pk3 ' + DEST)
+ self.system('cp games/WolfPack/lights.pk3 ' + DEST)
+ self.system('cp -R games/WolfPack/scripts ' + DEST)
+ self.system('cp -R games/WolfPack/maps ' + DEST)
+ self.system('cp -R games/WolfPack/models ' + DEST)
# game file
- self.system('cp -R ../WolfPack/bin/games/wolf.game ' + self.SETUP_DIR + '/games')
+ self.system('cp -R games/WolfPack/bin/games/wolf.game ' + self.SETUP_DIR + '/games')
def copy_et(self):
# goes in core
DEST = self.SETUP_DIR + '/core/et.game'
self.system('mkdir -p ' + DEST)
- self.system('cp -R ../ETPack/docs ' + DEST)
- self.system('cp -R ../ETPack/et.game/* ' + DEST)
+ self.system('cp -R games/ETPack/docs ' + DEST)
+ self.system('cp -R games/ETPack/et.game/* ' + DEST)
# goes in game install path
DEST = self.SETUP_DIR + '/et/etmain'
self.system('mkdir -p ' + DEST)
- self.system('cp ../ETPack/astro-skies.pk3 ' + DEST)
- self.system('cp ../ETPack/common.pk3 ' + DEST)
- self.system('cp ../ETPack/goldrush.pcx ' + DEST)
- self.system('cp ../ETPack/lights.pk3 ' + DEST)
- self.system('cp ../ETPack/mapmedia.pk3 ' + DEST)
- self.system('cp -R ../ETPack/scripts ' + DEST)
- self.system('cp -R ../ETPack/maps ' + DEST)
- self.system('cp -R ../ETPack/models ' + DEST)
+ self.system('cp games/ETPack/astro-skies.pk3 ' + DEST)
+ self.system('cp games/ETPack/common.pk3 ' + DEST)
+ self.system('cp games/ETPack/goldrush.pcx ' + DEST)
+ self.system('cp games/ETPack/lights.pk3 ' + DEST)
+ self.system('cp games/ETPack/mapmedia.pk3 ' + DEST)
+ self.system('cp -R games/ETPack/scripts ' + DEST)
+ self.system('cp -R games/ETPack/maps ' + DEST)
+ self.system('cp -R games/ETPack/models ' + DEST)
# game file
- self.system('cp -R ../ETPack/games/et.game ' + self.SETUP_DIR + '/games')
+ self.system('cp -R games/ETPack/games/et.game ' + self.SETUP_DIR + '/games')
def copy_doom3(self):
# goes in core
DEST = self.SETUP_DIR + '/core/doom3.game'
self.system('mkdir -p ' + DEST)
- self.system('cp -R ../Doom3Pack/tools/doom3.game/* ' + DEST)
+ self.system('cp -R games/Doom3Pack/tools/doom3.game/* ' + DEST)
# game file
- self.system('cp -R ../Doom3Pack/tools/games/doom3.game ' + self.SETUP_DIR + '/games')
+ self.system('cp -R games/Doom3Pack/tools/games/doom3.game ' + self.SETUP_DIR + '/games')
def copy_q2(self):
# binaries
@@ -749,17 +749,17 @@
# goes in core
DEST = self.SETUP_DIR + '/core/q2.game'
self.system('mkdir -p ' + DEST + '/modules')
- self.system('cp -R ../Q2Pack/q2.game/* ' + DEST)
+ self.system('cp -R games/Q2Pack/q2.game/* ' + DEST)
self.system('cp install/q2/q2map install/q2/qdata3 ' + DEST)
# self.system('cp -R install/q2/modules ' + DEST )
# goes in game install path
DEST = self.SETUP_DIR + '/q2'
self.system('mkdir -p ' + DEST + '/baseq2')
- self.system('cp -R ../Q2Pack/baseq2/* ' + DEST + '/baseq2')
+ self.system('cp -R games/Q2Pack/baseq2/* ' + DEST + '/baseq2')
# game file
- self.system('cp -R ../Q2Pack/games/q2.game ' + self.SETUP_DIR + '/games')
+ self.system('cp -R games/Q2Pack/games/q2.game ' + self.SETUP_DIR + '/games')
def copy_her2(self):
# binaries
@@ -768,17 +768,17 @@
# goes in core
DEST = self.SETUP_DIR + '/core/heretic2.game'
self.system('mkdir -p ' + DEST + '/modules')
- self.system('cp -R ../Her2Pack/heretic2.game/* ' + DEST)
+ self.system('cp -R games/Her2Pack/heretic2.game/* ' + DEST)
self.system('cp install/q2/q2map install/heretic2/qdata3 ' + DEST)
# self.system('cp -R install/heretic2/modules ' + DEST )
# goes in game install path
DEST = self.SETUP_DIR + '/heretic2'
self.system('mkdir -p ' + DEST + '/base')
- self.system('cp -R ../Her2Pack/base/* ' + DEST + '/base')
+ self.system('cp -R games/Her2Pack/base/* ' + DEST + '/base')
# game file
- self.system('cp -R ../Her2Pack/games/heretic2.game ' + self.SETUP_DIR + '/games')
+ self.system('cp -R games/Her2Pack/games/heretic2.game ' + self.SETUP_DIR + '/games')
def build_setup(self):
self.system( 'cp -R ' + self.SETUP_IMAGE_OS + '/* ' + self.SETUP_DIR )
Modified: GtkRadiant/trunk/docs/developer/README
===================================================================
--- GtkRadiant/trunk/docs/developer/README 2004-10-01 19:51:53 UTC (rev 4817)
+++ GtkRadiant/trunk/docs/developer/README 2004-10-01 19:54:36 UTC (rev 4818)
@@ -20,7 +20,7 @@
Execute 'scons' in the directory containing SConscript
install:
-copy the contents of './setup/data/tools/' to './install/'
+copy the contents of 'Q3Pack/tools/' to './install/'
copy the contents of './radiant/bitmaps/' to './install/bitmaps/'
note - the install data is not modified by the build, but it may be modified when you update from svn
Modified: GtkRadiant/trunk/setup/linux/gtkradiant-1.5.0.spec
===================================================================
--- GtkRadiant/trunk/setup/linux/gtkradiant-1.5.0.spec 2004-10-01 19:51:53 UTC (rev 4817)
+++ GtkRadiant/trunk/setup/linux/gtkradiant-1.5.0.spec 2004-10-01 19:54:36 UTC (rev 4818)
@@ -65,7 +65,7 @@
cp games/ETPack/et.game/default_build_menu.txt $RPM_BUILD_ROOT%{installdir}/et.game/bitmaps
mkdir $RPM_BUILD_ROOT%{installdir}/games
cp games/ETPack/games/et.game $RPM_BUILD_ROOT%{installdir}/games
-cp setup/data/tools/games/q3.game $RPM_BUILD_ROOT%{installdir}/games
+cp games/Q3Pack/tools/games/q3.game $RPM_BUILD_ROOT%{installdir}/games
cp games/Doom3Pack/tools/games/doom3.game $RPM_BUILD_ROOT%{installdir}/games
mkdir $RPM_BUILD_ROOT%{installdir}/modules
cp install/modules/entity.so $RPM_BUILD_ROOT%{installdir}/modules
@@ -84,15 +84,15 @@
cp install/modules/archivewad.so $RPM_BUILD_ROOT%{installdir}/modules
mkdir $RPM_BUILD_ROOT%{installdir}/q3.game
mkdir $RPM_BUILD_ROOT%{installdir}/q3.game/missionpack
-cp setup/data/tools/q3.game/missionpack/default_shaderlist.txt $RPM_BUILD_ROOT%{installdir}/q3.game/missionpack
-cp setup/data/tools/q3.game/missionpack/entities-ta.def $RPM_BUILD_ROOT%{installdir}/q3.game/missionpack
-cp setup/data/tools/q3.game/synapse.config $RPM_BUILD_ROOT%{installdir}/q3.game
-cp setup/data/tools/q3.game/game.xlink $RPM_BUILD_ROOT%{installdir}/q3.game
+cp games/Q3Pack/tools/q3.game/missionpack/default_shaderlist.txt $RPM_BUILD_ROOT%{installdir}/q3.game/missionpack
+cp games/Q3Pack/tools/q3.game/missionpack/entities-ta.def $RPM_BUILD_ROOT%{installdir}/q3.game/missionpack
+cp games/Q3Pack/tools/q3.game/synapse.config $RPM_BUILD_ROOT%{installdir}/q3.game
+cp games/Q3Pack/tools/q3.game/game.xlink $RPM_BUILD_ROOT%{installdir}/q3.game
mkdir $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
-cp setup/data/tools/q3.game/baseq3/entities.ent $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
-cp setup/data/tools/q3.game/baseq3/default_shaderlist.txt $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
-cp setup/data/tools/q3.game/baseq3/entities.def $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
-cp setup/data/tools/q3.game/default_build_menu.xml $RPM_BUILD_ROOT%{installdir}/q3.game
+cp games/Q3Pack/tools/q3.game/baseq3/entities.ent $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
+cp games/Q3Pack/tools/q3.game/baseq3/default_shaderlist.txt $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
+cp games/Q3Pack/tools/q3.game/baseq3/entities.def $RPM_BUILD_ROOT%{installdir}/q3.game/baseq3
+cp games/Q3Pack/tools/q3.game/default_build_menu.xml $RPM_BUILD_ROOT%{installdir}/q3.game
mkdir $RPM_BUILD_ROOT%{installdir}/bitmaps
cp radiant/bitmaps/view_cubicclipping.bmp $RPM_BUILD_ROOT%{installdir}/bitmaps
cp radiant/bitmaps/cap_endcap.bmp $RPM_BUILD_ROOT%{installdir}/bitmaps
Modified: GtkRadiant/trunk/setup/win32/gtkradiant-1.5.0.xml
===================================================================
--- GtkRadiant/trunk/setup/win32/gtkradiant-1.5.0.xml 2004-10-01 19:51:53 UTC (rev 4817)
+++ GtkRadiant/trunk/setup/win32/gtkradiant-1.5.0.xml 2004-10-01 19:54:36 UTC (rev 4818)
@@ -32,7 +32,7 @@
<component name=".\components\radiant_manual.xml" root="..\..\docs\manual"/>
<feature name="Quake III Arena Support" desc="Support for Quake III Arena.">
- <component name=".\components\q3.xml" root="..\data\tools"/>
+ <component name=".\components\q3.xml" root="..\..\games\Q3Pack\tools"/>
<!--
<component name=".\components\q3a_shader_manual.xml" root="..\..\docs\manual\quake3"/>
<component name=".\components\q3a_terrain_manual.xml" root="..\..\docs\manual\quake3"/>
Modified: GtkRadiant/trunk/setup/win32/q3a_example_maps.xml
===================================================================
--- GtkRadiant/trunk/setup/win32/q3a_example_maps.xml 2004-10-01 19:51:53 UTC (rev 4817)
+++ GtkRadiant/trunk/setup/win32/q3a_example_maps.xml 2004-10-01 19:54:36 UTC (rev 4818)
@@ -2,10 +2,10 @@
<package name="Quake III Arena Example Maps" version="1.0.0" target="[ProgramFilesFolder]\Quake III Arena" code="dc5cba98-c701-4e73-8d12-c842c3fe44ce" license="..\license.rtf">
<feature name="Quake III Arena Example Maps" desc="This feature must be installed in your Quake III Arena folder.">
<feature name="Quake III Arena Maps" desc="Example maps, models and textures for vanilla Quake III Arena">
- <component name=".\components\q3a_data.xml" root="..\data"/>
+ <component name=".\components\q3a_data.xml" root="..\..\games\Q3Pack"/>
</feature>
<feature name="Quake III Team Arena Maps" desc="Example maps, models and textures for Quake III Team Arena">
- <component name=".\components\q3ta_data.xml" root="..\data"/>
+ <component name=".\components\q3ta_data.xml" root="..\..\games\Q3Pack"/>
</feature>
</feature>
</package>
More information about the Gtkradiant
mailing list