增加工程
删除汇多协议
diff --git a/tcutils/disttools.py b/tcutils/disttools.py
index adf59ee..591f581 100644
--- a/tcutils/disttools.py
+++ b/tcutils/disttools.py
@@ -3,12 +3,20 @@
import sys
import os
from zipfile import ZipFile, ZIP_DEFLATED
+import distutils.util
-if sys.platform == 'win32':
- build_path = 'build/exe.win32-2.6'
-else:
- build_path = "build/exe"
+def get_build_path():
+ os_name = distutils.util.get_platform()
+ version = sys.version_info
+ if isinstance(version, tuple):
+ os_ver = '%d.%d' % (version[0], version[1])
+ else:
+ os_ver = '%d.%d' % (version.major, version.minor)
+ return os.path.join('build', 'exe.%s-%s' % (os_name, os_ver))
+
+
+build_path = get_build_path()
def _make_zip_file(args, dirname, names):
@@ -28,7 +36,7 @@
def make_dist(name, version, dist_dir='dist'):
- dist_version_name = "%s-%s" % (name, version)
+ dist_version_name = "%s-%s-%s" % (name, version, distutils.util.get_platform())
dist_name = os.path.join(dist_dir, dist_version_name + '.zip')
print "Make zip file ...[%s]" % os.path.relpath(dist_name)
zip_file_name = os.path.basename(dist_name)
@@ -38,4 +46,4 @@
zip = ZipFile(zip_file_name, 'w', ZIP_DEFLATED)
build_dir = os.path.realpath(build_path)
os.path.walk(build_dir, _make_zip_file, (zip, build_dir, dist_version_name))
- zip.close()
\ No newline at end of file
+ zip.close()