From d36bd370321f8685761f4760ce7e5ddc9a4dd3b2 Mon Sep 17 00:00:00 2001 From: "SND\\ussrhero_cp" Date: Tue, 15 Mar 2016 19:22:33 +0000 Subject: [PATCH] [0.3.x] updated : setup.py for python 3 support git-svn-id: https://pykd.svn.codeplex.com/svn@90960 9b283d60-5439-405e-af05-b73fd8c4d996 --- setup/buildall.cmd | 13 +++++++++---- setup/setup.py | 26 ++++++++++++++++---------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/setup/buildall.cmd b/setup/buildall.cmd index 7b02efc..f746ea3 100644 --- a/setup/buildall.cmd +++ b/setup/buildall.cmd @@ -1,4 +1,9 @@ -python setup.py bdist_zip --plat-name=win32 -python setup.py bdist_zip --plat-name=win-amd64 -python setup.py bdist_wheel --plat-name=win32 -python setup.py bdist_wheel --plat-name=win-amd64 \ No newline at end of file +py -2.7 setup.py bdist_zip --plat-name=win32 +py -2.7 setup.py bdist_zip --plat-name=win-amd64 +py -2.7 setup.py bdist_wheel --plat-name=win32 +py -2.7 setup.py bdist_wheel --plat-name=win-amd64 + +py -3.5 setup.py bdist_zip --plat-name=win32 +py -3.5 setup.py bdist_zip --plat-name=win-amd64 +py -3.5 setup.py bdist_wheel --plat-name=win32 +py -3.5 setup.py bdist_wheel --plat-name=win-amd64 \ No newline at end of file diff --git a/setup/setup.py b/setup/setup.py index 4b493f0..ffabeca 100644 --- a/setup/setup.py +++ b/setup/setup.py @@ -1,14 +1,18 @@ -from setuptools import setup +from setuptools import setup from setuptools.dist import Distribution import pkg_resources import argparse import os import shutil import zipfile +import sys _name = "pykd" _desc = "python windbg extension" -_version = '0.3.0.36' +_version = '0.3.0.39' + +def getReleaseSrc(): + return 'Release_%d.%d' % sys.version_info[0:2] def makeWheel(args): @@ -32,10 +36,10 @@ def makeWheel(args): pykd_dir = os.path.join( os.path.curdir, '..', 'out') if args.plat_name == 'win32': bin_dir = os.path.join( bin_dir, 'x86') - pykd_dir = os.path.join(pykd_dir, 'Win32', 'Release_2.7') + pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc()) elif args.plat_name == 'win-amd64': bin_dir = os.path.join( bin_dir, 'x64') - pykd_dir = os.path.join(pykd_dir, 'X64', 'Release_2.7') + pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc()) else: assert(0) @@ -63,8 +67,8 @@ def makeWheel(args): ) def makeZip(args): + #make package catalog - # make package catalog package_dir = os.path.join(os.path.curdir, _name ) if os.path.exists(package_dir): shutil.rmtree(package_dir) @@ -74,14 +78,16 @@ def makeZip(args): pykd_dir = os.path.join( os.path.curdir, '..', 'out') if args.plat_name == 'win32': bin_dir = os.path.join( bin_dir, 'x86') - pykd_dir = os.path.join(pykd_dir, 'Win32', 'Release_2.7') + pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc()) elif args.plat_name == 'win-amd64': bin_dir = os.path.join( bin_dir, 'x64') - pykd_dir = os.path.join(pykd_dir, 'X64', 'Release_2.7') + pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc()) else: assert(0) - zip_str = "pykd-%s-py27-%s" % ( _version, args.plat_name ) + pyver="%d%d" % sys.version_info[0:2] + + zip_str = "pykd-%s-py%s-%s" % ( _version, pyver, args.plat_name ) zip_name = zip_str + ".zip" assert(os.path.isdir(bin_dir)) @@ -97,10 +103,10 @@ def makeZip(args): with zipfile.ZipFile(os.path.join(os.path.curdir, 'dist', zip_name), mode='w' ) as archive: for srcFile in os.listdir(package_dir): - print "zipped %s" % (srcFile) + print( "zipped %s" % (srcFile) ) archive.write( os.path.join(package_dir, srcFile), compress_type = zipfile.ZIP_DEFLATED) - print "OK" + print("OK")