Skip to content

Refactor setup.py #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmuriart merged 12 commits into from
Jan 30, 2017
Merged

Refactor setup.py #337

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67c1612
Use built-in check_output (mostly)
vmuriart Jan 12, 2017
9143b54
Rename build classes, and PLATFORM to ARCH
vmuriart Jan 27, 2017
5359098
Organize imports
vmuriart Jan 27, 2017
0078d76
Move to appropriate context
vmuriart Jan 27, 2017
8fe702a
Refactor registry search
vmuriart Jan 27, 2017
de63017
Format setup.py
vmuriart Jan 28, 2017
ee21001
Organize functions
vmuriart Jan 28, 2017
b32b4d0
Create get_source_files function
vmuriart Jan 28, 2017
f520829
No need to put `setup` in `if __name__==...`
vmuriart Jan 28, 2017
126e5f0
Add long_description
vmuriart Jan 28, 2017
ccf96cb
Clean-up getinterop
vmuriart Jan 29, 2017
6521033
Fix setup.py log messages
vmuriart Jan 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix setup.py log messages 
self.announce is based on an incomplete logger.
use debug_print that turns on when env_var DISTUTILS_DEBUG is present
  • Loading branch information
@vmuriart
vmuriart committed Jan 30, 2017
commit 65210335d2e4b5efffdb9d840503fb402e037752
13 changes: 7 additions & 6 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def build_extension(self, ext):
# check the interop file exists, and create it if it doesn't
interop_file = _get_interop_filename()
if not os.path.exists(interop_file):
self.debug_print("Creating {0}".format(interop_file))
geninterop = os.path.join("tools", "geninterop", "geninterop.py")
subprocess.check_call([sys.executable, geninterop, interop_file])

Expand Down Expand Up @@ -218,7 +219,7 @@ def build_extension(self, ext):
if manifest:
cmd.append('/p:PythonManifest="{0}"'.format(manifest))

self.announce("Building: {0}".format(" ".join(cmd)))
self.debug_print("Building: {0}".format(" ".join(cmd)))
use_shell = True if DEVTOOLS == "Mono" else False
subprocess.check_call(" ".join(cmd + ["/t:Clean"]), shell=use_shell)
subprocess.check_call(" ".join(cmd + ["/t:Build"]), shell=use_shell)
Expand All @@ -233,7 +234,7 @@ def _get_manifest(self, build_dir):
manifest = os.path.abspath(os.path.join(build_dir, "app.manifest"))
cmd = [mt, '-inputresource:"{0}"'.format(sys.executable),
'-out:"{0}"'.format(manifest)]
self.announce("Extracting manifest from {}".format(sys.executable))
self.debug_print("Extracting manifest from {}".format(sys.executable))
subprocess.check_call(" ".join(cmd), shell=False)
return manifest

Expand Down Expand Up @@ -267,11 +268,11 @@ def _install_packages(self):
use_shell = True

cmd = "{0} update -self".format(nuget)
self.announce("Updating NuGet: {0}".format(cmd))
self.debug_print("Updating NuGet: {0}".format(cmd))
subprocess.check_call(cmd, shell=use_shell)

cmd = "{0} restore pythonnet.sln -o packages".format(nuget)
self.announce("Installing packages: {0}".format(cmd))
self.debug_print("Installing packages: {0}".format(cmd))
subprocess.check_call(cmd, shell=use_shell)

def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
Expand All @@ -297,7 +298,7 @@ def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
continue
path = os.path.join(val, rkey.suffix, tool)
if os.path.exists(path):
self.announce("Using {0} from {1}".format(
self.debug_print("Using {0} from {1}".format(
tool, rkey.sdk_name))
return path
except WindowsError:
Expand All @@ -313,7 +314,7 @@ def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
suffix = "Bin\\x64" if ARCH == "x64" else "Bin"
path = os.path.join(localappdata, vs_python, suffix, tool)
if os.path.exists(path):
self.announce("Using {0} from {1}".format(tool, sdk_name))
self.debug_print("Using {0} from {1}".format(tool, sdk_name))
return path

raise RuntimeError("{0} could not be found".format(tool))
Expand Down