TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

deploy-ng: Make use of distutils.core.Command.announce() instead of print() for verbosity levels

Browse Source
This commit is contained in:
Mitchell Stokes 2017-11-21 19:02:27 -08:00
parent 56ebf981df
commit a2fd511db8
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
direct/src/showutil/dist.py
View File

@ -6,12 +6,11 @@ import pip
import sys import sys
import subprocess import subprocess
import zipfile import zipfile
import shutil
import struct import struct
import io import io
import distutils.core import distutils.core
import distutils.dir_util
import distutils.file_util
import distutils.log import distutils.log
from . import FreezeTool from . import FreezeTool
@ -75,7 +74,7 @@ class build_apps(distutils.core.Command):
else: else:
platforms = self.deploy_platforms platforms = self.deploy_platforms
use_wheels = True use_wheels = True
print("Building platforms: {0}".format(','.join(platforms))) self.announce('Building platforms: {0}'.format(','.join(platforms)), distutils.log.INFO)
for platform in platforms: for platform in platforms:
self.build_runtimes(platform, use_wheels) self.build_runtimes(platform, use_wheels)
@ -119,8 +118,8 @@ class build_apps(distutils.core.Command):
builddir = os.path.join(self.build_base, platform) builddir = os.path.join(self.build_base, platform)
if os.path.exists(builddir): if os.path.exists(builddir):
distutils.dir_util.remove_tree(builddir) shutil.rmtree(builddir)
distutils.dir_util.mkpath(builddir) os.mkdir(builddir)
path = sys.path[:] path = sys.path[:]
p3dwhl = None p3dwhl = None
@ -247,9 +246,9 @@ class build_apps(distutils.core.Command):
dtool_fn = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name()) dtool_fn = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name())
libdir = os.path.dirname(dtool_fn.to_os_specific()) libdir = os.path.dirname(dtool_fn.to_os_specific())
src = os.path.join(libdir, '..', 'etc') src = os.path.join(libdir, '..', 'etc')
distutils.dir_util.copy_tree(src, etcdir) shutil.copytree(src, etcdir)
else: else:
distutils.dir_util.mkpath(etcdir) os.makedirs(etcdir)
# Combine prc files with libs and copy the whole list # Combine prc files with libs and copy the whole list
panda_files = [i for i in p3dwhl.namelist() if i.endswith('.prc')] panda_files = [i for i in p3dwhl.namelist() if i.endswith('.prc')]
@ -278,7 +277,7 @@ class build_apps(distutils.core.Command):
for pattern in ignore_copy_list: for pattern in ignore_copy_list:
# Normalize file paths across platforms # Normalize file paths across platforms
path = p3d.Filename.from_os_specific(src).get_fullpath() path = p3d.Filename.from_os_specific(src).get_fullpath()
#print("check ignore:", pattern, src, pattern.matches(path)) #self.announce('check ignore: {} {} {}'.format(pattern, src, pattern.matches(path)))
if pattern.matches(path): if pattern.matches(path):
return True return True
return False return False
@ -295,12 +294,12 @@ class build_apps(distutils.core.Command):
dst = os.path.normpath(dst) dst = os.path.normpath(dst)
if check_pattern(src): if check_pattern(src):
print("skipping file", src) self.announce('skipping file {}'.format(src))
return return
dst_dir = os.path.dirname(dst) dst_dir = os.path.dirname(dst)
if not os.path.exists(dst_dir): if not os.path.exists(dst_dir):
distutils.dir_util.mkpath(dst_dir) os.makedirs(dst_dir)
ext = os.path.splitext(src)[1] ext = os.path.splitext(src)[1]
if not ext: if not ext:
@ -311,11 +310,11 @@ class build_apps(distutils.core.Command):
dst_ext, script = self.build_scripts[ext] dst_ext, script = self.build_scripts[ext]
dst = dst_root + dst_ext dst = dst_root + dst_ext
script = script.format(src, dst) script = script.format(src, dst)
print("using script:", script) self.announce('using script: {}'.format(script))
subprocess.call(script.split()) subprocess.call(script.split())
else: else:
#print("Copy file", src, dst) self.announce('copying {0} -> {1}'.format(src, dst))
distutils.file_util.copy_file(src, dst) shutil.copyfile(src, dst)
def copy_dir(src, dst): def copy_dir(src, dst):
for item in os.listdir(src): for item in os.listdir(src):
@ -324,7 +323,7 @@ class build_apps(distutils.core.Command):
if os.path.isfile(s): if os.path.isfile(s):
copy_file(s, d) copy_file(s, d)
elif not dir_has_files(s): elif not dir_has_files(s):
print("skipping directory", os.path.normpath(s)) self.announce('skipping directory'.format(os.path.normpath(s)))
else: else:
copy_dir(s, d) copy_dir(s, d)
@ -406,10 +405,10 @@ class build_apps(distutils.core.Command):
source_path may be located inside a .whl file. """ source_path may be located inside a .whl file. """
try: try:
print("copying {0} -> {1}".format(os.path.relpath(source_path, self.build_base), os.path.relpath(target_path, self.build_base))) self.announce('copying {0} -> {1}'.format(os.path.relpath(source_path, self.build_base), os.path.relpath(target_path, self.build_base)))
except ValueError: except ValueError:
# No relative path (e.g., files on different drives in Windows), just print absolute paths instead # No relative path (e.g., files on different drives in Windows), just print absolute paths instead
print("copying {0} -> {1}".format(source_path, target_path)) self.announce('copying {0} -> {1}'.format(source_path, target_path))
# Copy the file, and open it for analysis. # Copy the file, and open it for analysis.
if '.whl' in source_path: if '.whl' in source_path:
@ -425,7 +424,7 @@ class build_apps(distutils.core.Command):
fp = io.BytesIO(data) fp = io.BytesIO(data)
else: else:
# Regular file, copy it # Regular file, copy it
distutils.file_util.copy_file(source_path, target_path) shutil.copy_file(source_path, target_path)
fp = open(target_path, 'rb') fp = open(target_path, 'rb')
# What kind of magic does the file contain? # What kind of magic does the file contain?
@ -594,12 +593,12 @@ class bdist_apps(distutils.core.Command):
basename = '{}_{}'.format(self.distribution.get_fullname(), platform) basename = '{}_{}'.format(self.distribution.get_fullname(), platform)
if (os.path.exists(temp_dir)): if (os.path.exists(temp_dir)):
distutils.dir_util.remove_tree(temp_dir) shutil.rmtree(temp_dir)
distutils.dir_util.copy_tree(build_dir, temp_dir) shutil.copy_tree(build_dir, temp_dir)
distutils.archive_util.make_archive(basename, archive_format, root_dir=build_base, base_dir=base_dir) distutils.archive_util.make_archive(basename, archive_format, root_dir=build_base, base_dir=base_dir)
distutils.dir_util.remove_tree(temp_dir) shutil.rmtree(temp_dir)
def setup(**attrs): def setup(**attrs):
commandClasses = attrs.setdefault("cmdclass", {}) commandClasses = attrs.setdefault("cmdclass", {})