generall update with alot off small stuff

2 files changed, 40 insertions, 10 deletions

diff --git a/scripts/make_release.py b/scripts/make_release.py
index ce7197e9..7867413a 100644
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -1,6 +1,6 @@
 import shutil, os, sys, zipfile
 
-valid_platforms = ["win32", "linux86", "linux86_64"]
+valid_platforms = ["win32", "linux86", "linux86_64", "src"]
 
 if len(sys.argv) != 3:
 	print "wrong number of arguments"
@@ -12,6 +12,17 @@ version = sys.argv[1]
 platform = sys.argv[2]
 exe_ext = ""
 use_zip = 0
+use_gz = 1
+include_data = True
+include_exe = True
+include_src = False
+
+if platform == "src":
+	include_data = False
+	include_exe = False
+	include_src = True
+	use_zip = 1
+	use_gz = 1
 
 if not platform in valid_platforms:
 	print "not a valid platform"
@@ -21,8 +32,9 @@ if not platform in valid_platforms:
 if platform == 'win32':
 	exe_ext = ".exe"
 	use_zip = 1
+	use_gz = 0
 
-def copydir(src, dst):
+def copydir(src, dst, excl=[]):
 	for root, dirs, files in os.walk(src, topdown=True):
 		if "/." in root or "\\." in root:
 			continue
@@ -36,23 +48,41 @@ def copydir(src, dst):
 package = "%s-%s-%s" %(name, version, platform)
 package_dir = package
 
+print "cleaning target"
 shutil.rmtree(package_dir, True)
 os.mkdir(package_dir)
-os.mkdir(os.path.join(package_dir, "data"))
-copydir("data", package_dir)
+
+print "adding files"
 shutil.copy("readme.txt", package_dir)
+shutil.copy("license.txt", package_dir)
 
-shutil.copy("teewars"+exe_ext, package_dir)
-shutil.copy("teewars_srv"+exe_ext, package_dir)
+if include_data:
+	os.mkdir(os.path.join(package_dir, "data"))
+	copydir("data", package_dir)
+
+if include_exe:
+	shutil.copy("teewars"+exe_ext, package_dir)
+	shutil.copy("teewars_srv"+exe_ext, package_dir)
+	
+if include_src:
+	for p in ["src", "scripts", "datasrc"] :
+		os.mkdir(os.path.join(package_dir, p))
+		copydir(p, package_dir)
+	shutil.copy("default.bam", package_dir)
 
 if use_zip:
+	print "making zip archive"
 	zf = zipfile.ZipFile("%s.zip" % package, 'w', zipfile.ZIP_DEFLATED)
 	
 	for root, dirs, files in os.walk(package_dir, topdown=True):
 		for name in files:
 			n = os.path.join(root, name)
 			zf.write(n, n)
-	zf.printdir()
+	#zf.printdir()
 	zf.close()
-else:
-	os.system("tar czvf %s.tar.gz %s" % (package, package_dir))
+	
+if use_gz:
+	print "making tar.gz archive"
+	os.system("tar czf %s.tar.gz %s" % (package, package_dir))
+	
+print "done"
diff --git a/scripts/mass_server.py b/scripts/mass_server.py
index 42aed747..bdd42174 100644
--- a/scripts/mass_server.py
+++ b/scripts/mass_server.py
@@ -3,7 +3,7 @@
 import random
 import os
 
-masterservers = ["localhost 8383"]
+masterservers = ["localhost 8300"]
 
 maps = [
 	["dm1", "dm2", "dm6"],