From bc3b1d0534d0b9c61338d25ff97086eb91daa6e9 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 15 Dec 2007 14:48:12 +0000 Subject: updated ctf2 and build scripts --- data/maps/ctf2.map | Bin 321774 -> 321774 bytes scripts/build.py | 10 ++++++---- scripts/make_src.py | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data/maps/ctf2.map b/data/maps/ctf2.map index 4e733dfd..272ac8b8 100644 Binary files a/data/maps/ctf2.map and b/data/maps/ctf2.map differ diff --git a/scripts/build.py b/scripts/build.py index 71995ae9..5ec7a0d7 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -87,12 +87,14 @@ os.chdir(root_dir) # download if flag_download: print "*** downloading bam source package ***" - if not fetch_file("www.teewars.com", "/files/beta/bam.zip", "bam.zip"): - bail("couldn't find source package and couldn't download it") + if not fetch_file("www.teewars.com", "/files/bam.zip", "bam.zip"): + if not fetch_file("www.teewars.com", "/files/beta/bam.zip", "bam.zip"): + bail("couldn't find source package and couldn't download it") print "*** downloading teewars source package ***" - if not fetch_file("www.teewars.com", "/files/beta/%s" % src_package, src_package): - bail("couldn't find source package and couldn't download it") + if not fetch_file("www.teewars.com", "/files/%s" % src_package, src_package): + if not fetch_file("www.teewars.com", "/files/beta/%s" % src_package, src_package): + bail("couldn't find source package and couldn't download it") # unpack print "*** unpacking source ***" diff --git a/scripts/make_src.py b/scripts/make_src.py index bf732028..58a1e1a7 100644 --- a/scripts/make_src.py +++ b/scripts/make_src.py @@ -3,6 +3,9 @@ import os, shutil, zipfile, sys version = sys.argv[1] svn_tree = "tags/release-%s" % version +if len(sys.argv) > 2: + svn_tree = sys.argv[2] + # make clean if 1: try: shutil.rmtree("srcwork") -- cgit 1.4.1