From 666847b0ce4f60ce5e8863fa0958da8195fb091e Mon Sep 17 00:00:00 2001 From: TTimo Date: Sat, 24 Aug 2013 22:50:12 +0000 Subject: [PATCH] switch to xp compatible compiler toolchain, add/fix an archive and upload script for the VM builder --- contrib/bkgrnd2d/bkgrnd2d.vcxproj | 8 ++--- contrib/bobtoolz/bobtoolz.vcxproj | 8 ++--- contrib/camera/camera.vcxproj | 8 ++--- contrib/gtkgensurf/gtkgensurf.vcxproj | 8 ++--- contrib/hydratoolz/hydratoolz.vcxproj | 8 ++--- contrib/prtview/prtview.vcxproj | 8 ++--- libs/cmdlib/cmdlib.vcxproj | 8 ++--- libs/ddslib/ddslib.vcxproj | 8 ++--- libs/l_net/l_net.vcxproj | 8 ++--- libs/mathlib/mathlib.vcxproj | 8 ++--- libs/md5lib/md5lib.vcxproj | 8 ++--- libs/picomodel/picomodel.vcxproj | 8 ++--- libs/splines/splines.vcxproj | 8 ++--- libs/synapse/synapse.vcxproj | 8 ++--- plugins/eclassfgd/fgd.vcxproj | 8 ++--- plugins/entity/entity.vcxproj | 8 ++--- plugins/image/image.vcxproj | 8 ++--- plugins/imagehl/imagehl.vcxproj | 8 ++--- plugins/imagem8/imagem8.vcxproj | 8 ++--- plugins/imagepng/imagepng.vcxproj | 8 ++--- plugins/imagewal/imagewal.vcxproj | 8 ++--- plugins/map/map.vcxproj | 8 ++--- plugins/mapxml/mapxml.vcxproj | 8 ++--- plugins/model/model.vcxproj | 8 ++--- plugins/shaders/shaders.vcxproj | 8 ++--- plugins/spritemodel/spritemodel.vcxproj | 8 ++--- plugins/surface/surface.vcxproj | 8 ++--- .../surface_idtech2/surface_idtech2.vcxproj | 8 ++--- plugins/textool/textool.vcxproj | 8 ++--- plugins/vfspak/vfspak.vcxproj | 8 ++--- plugins/vfspk3/vfspk3.vcxproj | 8 ++--- plugins/vfsqlpk3/vfsqlpk3.vcxproj | 8 ++--- plugins/vfswad/vfswad.vcxproj | 8 ++--- prepare_archive.py | 30 +++++++++++++++++++ radiant/radiant.vcxproj | 8 ++--- tools/quake3/common/quake3-common.vcxproj | 8 ++--- tools/quake3/q3data/q3data.vcxproj | 8 ++--- tools/quake3/q3map2/q3map2.vcxproj | 8 ++--- .../tools/quake3/q3map2/q3map2_urt.vcxproj | 8 ++--- 39 files changed, 182 insertions(+), 152 deletions(-) create mode 100644 prepare_archive.py diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcxproj b/contrib/bkgrnd2d/bkgrnd2d.vcxproj index 25aa1a19..25453672 100644 --- a/contrib/bkgrnd2d/bkgrnd2d.vcxproj +++ b/contrib/bkgrnd2d/bkgrnd2d.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/contrib/bobtoolz/bobtoolz.vcxproj b/contrib/bobtoolz/bobtoolz.vcxproj index 37ae0916..bb0f5567 100644 --- a/contrib/bobtoolz/bobtoolz.vcxproj +++ b/contrib/bobtoolz/bobtoolz.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/contrib/camera/camera.vcxproj b/contrib/camera/camera.vcxproj index d17191b5..a4c0f4cb 100644 --- a/contrib/camera/camera.vcxproj +++ b/contrib/camera/camera.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/contrib/gtkgensurf/gtkgensurf.vcxproj b/contrib/gtkgensurf/gtkgensurf.vcxproj index fc009dd5..ec234394 100644 --- a/contrib/gtkgensurf/gtkgensurf.vcxproj +++ b/contrib/gtkgensurf/gtkgensurf.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/contrib/hydratoolz/hydratoolz.vcxproj b/contrib/hydratoolz/hydratoolz.vcxproj index 2f14eb5a..37226ec4 100644 --- a/contrib/hydratoolz/hydratoolz.vcxproj +++ b/contrib/hydratoolz/hydratoolz.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/contrib/prtview/prtview.vcxproj b/contrib/prtview/prtview.vcxproj index fae98afe..f4ff3eb8 100644 --- a/contrib/prtview/prtview.vcxproj +++ b/contrib/prtview/prtview.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/libs/cmdlib/cmdlib.vcxproj b/libs/cmdlib/cmdlib.vcxproj index ca698989..8aa8c4de 100644 --- a/libs/cmdlib/cmdlib.vcxproj +++ b/libs/cmdlib/cmdlib.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/ddslib/ddslib.vcxproj b/libs/ddslib/ddslib.vcxproj index d40be6ff..a2cf4b20 100644 --- a/libs/ddslib/ddslib.vcxproj +++ b/libs/ddslib/ddslib.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/l_net/l_net.vcxproj b/libs/l_net/l_net.vcxproj index ac3f61f0..bef68bfa 100644 --- a/libs/l_net/l_net.vcxproj +++ b/libs/l_net/l_net.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/mathlib/mathlib.vcxproj b/libs/mathlib/mathlib.vcxproj index 792b1dcf..02d92b13 100644 --- a/libs/mathlib/mathlib.vcxproj +++ b/libs/mathlib/mathlib.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/md5lib/md5lib.vcxproj b/libs/md5lib/md5lib.vcxproj index 8a8785db..f729d23b 100644 --- a/libs/md5lib/md5lib.vcxproj +++ b/libs/md5lib/md5lib.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj index f1d11d1a..b9bed4fe 100644 --- a/libs/picomodel/picomodel.vcxproj +++ b/libs/picomodel/picomodel.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/splines/splines.vcxproj b/libs/splines/splines.vcxproj index dddbad28..612d6e1f 100644 --- a/libs/splines/splines.vcxproj +++ b/libs/splines/splines.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/libs/synapse/synapse.vcxproj b/libs/synapse/synapse.vcxproj index 5fd4c26e..82d35292 100644 --- a/libs/synapse/synapse.vcxproj +++ b/libs/synapse/synapse.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/plugins/eclassfgd/fgd.vcxproj b/plugins/eclassfgd/fgd.vcxproj index b684c30f..c5aad7b6 100644 --- a/plugins/eclassfgd/fgd.vcxproj +++ b/plugins/eclassfgd/fgd.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/entity/entity.vcxproj b/plugins/entity/entity.vcxproj index f945a511..0cba3fd6 100644 --- a/plugins/entity/entity.vcxproj +++ b/plugins/entity/entity.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/image/image.vcxproj b/plugins/image/image.vcxproj index 7cc5fd71..f7e5cd9f 100644 --- a/plugins/image/image.vcxproj +++ b/plugins/image/image.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/imagehl/imagehl.vcxproj b/plugins/imagehl/imagehl.vcxproj index ce832596..f61dbe74 100644 --- a/plugins/imagehl/imagehl.vcxproj +++ b/plugins/imagehl/imagehl.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/imagem8/imagem8.vcxproj b/plugins/imagem8/imagem8.vcxproj index 40cb67ef..6aeda675 100644 --- a/plugins/imagem8/imagem8.vcxproj +++ b/plugins/imagem8/imagem8.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/imagepng/imagepng.vcxproj b/plugins/imagepng/imagepng.vcxproj index e065b975..a9bc6352 100644 --- a/plugins/imagepng/imagepng.vcxproj +++ b/plugins/imagepng/imagepng.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/imagewal/imagewal.vcxproj b/plugins/imagewal/imagewal.vcxproj index 956201f3..7de7e507 100644 --- a/plugins/imagewal/imagewal.vcxproj +++ b/plugins/imagewal/imagewal.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/map/map.vcxproj b/plugins/map/map.vcxproj index 986c4228..0a9d7bd1 100644 --- a/plugins/map/map.vcxproj +++ b/plugins/map/map.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/mapxml/mapxml.vcxproj b/plugins/mapxml/mapxml.vcxproj index 9bc28101..33a50d61 100644 --- a/plugins/mapxml/mapxml.vcxproj +++ b/plugins/mapxml/mapxml.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/model/model.vcxproj b/plugins/model/model.vcxproj index fad294d6..23d0d7cd 100644 --- a/plugins/model/model.vcxproj +++ b/plugins/model/model.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/shaders/shaders.vcxproj b/plugins/shaders/shaders.vcxproj index 224b4bf7..6803a707 100644 --- a/plugins/shaders/shaders.vcxproj +++ b/plugins/shaders/shaders.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/spritemodel/spritemodel.vcxproj b/plugins/spritemodel/spritemodel.vcxproj index 252646aa..cfba7856 100644 --- a/plugins/spritemodel/spritemodel.vcxproj +++ b/plugins/spritemodel/spritemodel.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/surface/surface.vcxproj b/plugins/surface/surface.vcxproj index d985e772..1130263e 100644 --- a/plugins/surface/surface.vcxproj +++ b/plugins/surface/surface.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/surface_idtech2/surface_idtech2.vcxproj b/plugins/surface_idtech2/surface_idtech2.vcxproj index 938720f2..81caebec 100644 --- a/plugins/surface_idtech2/surface_idtech2.vcxproj +++ b/plugins/surface_idtech2/surface_idtech2.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/textool/textool.vcxproj b/plugins/textool/textool.vcxproj index 9f27244b..a38fb815 100644 --- a/plugins/textool/textool.vcxproj +++ b/plugins/textool/textool.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/vfspak/vfspak.vcxproj b/plugins/vfspak/vfspak.vcxproj index c3164924..8bdedfd4 100644 --- a/plugins/vfspak/vfspak.vcxproj +++ b/plugins/vfspak/vfspak.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/vfspk3/vfspk3.vcxproj b/plugins/vfspk3/vfspk3.vcxproj index e45bac06..f4b91505 100644 --- a/plugins/vfspk3/vfspk3.vcxproj +++ b/plugins/vfspk3/vfspk3.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/vfsqlpk3/vfsqlpk3.vcxproj b/plugins/vfsqlpk3/vfsqlpk3.vcxproj index 31312f94..7a985c81 100644 --- a/plugins/vfsqlpk3/vfsqlpk3.vcxproj +++ b/plugins/vfsqlpk3/vfsqlpk3.vcxproj @@ -26,19 +26,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/plugins/vfswad/vfswad.vcxproj b/plugins/vfswad/vfswad.vcxproj index 6af926c6..3c994824 100644 --- a/plugins/vfswad/vfswad.vcxproj +++ b/plugins/vfswad/vfswad.vcxproj @@ -25,19 +25,19 @@ DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp DynamicLibrary - v110 + v110_xp diff --git a/prepare_archive.py b/prepare_archive.py new file mode 100644 index 00000000..d554c0af --- /dev/null +++ b/prepare_archive.py @@ -0,0 +1,30 @@ +import os, time, zipfile, functools, pprint, subprocess + +if ( __name__ == '__main__' ): + date_tag = time.strftime('%Y%m%d') + folder_name = 'GtkRadiant-1.6.4-%s' % date_tag + base_name = '%s.zip' % folder_name + full_path = os.path.join( r'D:\\', base_name ) + + def write_file( z, prefix_path, folder_name, root, fn ): + fullpath = os.path.join( root, fn ) + arcname = fullpath.replace( prefix_path, folder_name ) + print( '%s -> %s' % ( fullpath, arcname ) ) + z.write( fullpath, arcname ) + + z = zipfile.ZipFile( full_path, 'w', zipfile.ZIP_DEFLATED ) + prefix_path = r'D:\GtkRadiant\install' + for root, dirs, files in os.walk( prefix_path, topdown = True ): + if ( root.find( '.svn' ) >= 0 ): + continue + files = filter( + lambda n : not ( + n.endswith( '.lib' ) + or n.endswith( '.pdb' ) + or n.endswith( '.exp' ) ), + files ) + map( functools.partial( write_file, z, prefix_path, folder_name, root ), files ) + z.close() + + # could be nicer to import s3cmd + subprocess.check_call( [ r'C:\Python27\python.exe', r'C:\Python27\Scripts\s3cmd', 'put', full_path, 's3://gtkradiant' ] ) diff --git a/radiant/radiant.vcxproj b/radiant/radiant.vcxproj index c2de1a56..c9a72baf 100644 --- a/radiant/radiant.vcxproj +++ b/radiant/radiant.vcxproj @@ -25,19 +25,19 @@ Application - v110 + v110_xp Application - v110 + v110_xp Application - v110 + v110_xp Application - v110 + v110_xp diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj index 7be06d08..7d2faa75 100644 --- a/tools/quake3/common/quake3-common.vcxproj +++ b/tools/quake3/common/quake3-common.vcxproj @@ -25,19 +25,19 @@ StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp StaticLibrary - v110 + v110_xp diff --git a/tools/quake3/q3data/q3data.vcxproj b/tools/quake3/q3data/q3data.vcxproj index 0cd1ba72..534b6b8a 100644 --- a/tools/quake3/q3data/q3data.vcxproj +++ b/tools/quake3/q3data/q3data.vcxproj @@ -25,24 +25,24 @@ Application - v110 + v110_xp MultiByte true Application - v110 + v110_xp MultiByte true Application - v110 + v110_xp MultiByte Application - v110 + v110_xp MultiByte diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 73432a9a..0add46ac 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -25,19 +25,19 @@ Application - v110 + v110_xp Application - v110 + v110_xp Application - v110 + v110_xp Application - v110 + v110_xp diff --git a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj index 23899b7c..8c02e9b4 100644 --- a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj +++ b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj @@ -25,25 +25,25 @@ Application - v110 + v110_xp false MultiByte Application - v110 + v110_xp false MultiByte Application - v110 + v110_xp false MultiByte Application - v110 + v110_xp false MultiByte