about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-15 14:48:12 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-15 14:48:12 +0000
commitbc3b1d0534d0b9c61338d25ff97086eb91daa6e9 (patch)
tree48cd88b8af899012e49a7eddbec292fe85fe7463 /scripts
parent83d82aa6ac894b34b88f4311d4f2e6647dbab966 (diff)
downloadzcatch-bc3b1d0534d0b9c61338d25ff97086eb91daa6e9.tar.gz
zcatch-bc3b1d0534d0b9c61338d25ff97086eb91daa6e9.zip
updated ctf2 and build scripts
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build.py10
-rw-r--r--scripts/make_src.py3
2 files changed, 9 insertions, 4 deletions
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")