rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Update code base to support Python3 and Python2.

Browse Source 
Fix Windows support to allow MSYS2 Python to be used.

Updates #2619.
This commit is contained in:
Chris Johns
2016-03-07 11:56:02 +11:00
parent 76188ee494
commit f88fcf3ae0
29 changed files with 412 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source-builder/sb/path.py
View File

@@ -1,6 +1,6 @@
#
# RTEMS Tools Project (http://www.rtems.org/)
# Copyright 2010-2015 Chris Johns (chrisj@rtems.org)
# Copyright 2010-2016 Chris Johns (chrisj@rtems.org)
# All rights reserved.
#
# This file is part of the RTEMS Tools package in 'rtems-tools'.
@@ -23,6 +23,8 @@
# level. This allows macro expansion to work.
#
from __future__ import print_function
import log
import os
import shutil
@@ -119,18 +121,18 @@ def mkdir(path):
if windows:
try:
os.makedirs(host(path))
except IOError, err:
except IOError as err:
raise error.general('cannot make directory: %s' % (path))
except OSError, err:
except OSError as err:
raise error.general('cannot make directory: %s' % (path))
except WindowsError, err:
except WindowsError as err:
raise error.general('cannot make directory: %s' % (path))
else:
try:
os.makedirs(host(path))
except IOError, err:
except IOError as err:
raise error.general('cannot make directory: %s' % (path))
except OSError, err:
except OSError as err:
raise error.general('cannot make directory: %s' % (path))
def removeall(path):
@@ -172,7 +174,7 @@ def copy(src, dst):
hdst = host(dst)
try:
shutil.copy(hsrc, hdst)
except OSError, why:
except OSError as why:
if windows:
if WindowsError is not None and isinstance(why, WindowsError):
pass
@@ -191,19 +193,19 @@ def copy_tree(src, dst):
names = []
if trace:
print 'path.copy_tree:'
print ' src: %s' % (src)
print ' hsrc: %s' % (hsrc)
print ' dst: %s' % (dst)
print ' hdst: %s' % (hdst)
print ' names: %r' % (names)
print('path.copy_tree:')
print(' src: %s' % (src))
print(' hsrc: %s' % (hsrc))
print(' dst: %s' % (dst))
print(' hdst: %s' % (hdst))
print(' names: %r' % (names))
if not os.path.isdir(hdst):
if trace:
print ' mkdir: %s' % (hdst)
print(' mkdir: %s' % (hdst))
try:
os.makedirs(hdst)
except OSError, why:
except OSError as why:
raise error.general('copying tree: cannot create target directory %s: %s' % \
(hdst, str(why)))
@@ -230,15 +232,15 @@ def copy_tree(src, dst):
copy_tree(srcname, dstname)
else:
shutil.copy2(host(srcname), host(dstname))
except shutil.Error, err:
except shutil.Error as err:
raise error.general('copying tree: %s -> %s: %s' % \
(hsrc, hdst, str(err)))
except EnvironmentError, why:
except EnvironmentError as why:
raise error.general('copying tree: %s -> %s: %s' % \
(srcname, dstname, str(why)))
try:
shutil.copystat(hsrc, hdst)
except OSError, why:
except OSError as why:
if windows:
if WindowsError is not None and isinstance(why, WindowsError):
pass
@@ -246,17 +248,17 @@ def copy_tree(src, dst):
raise error.general('copying tree: %s -> %s: %s' % (hsrc, hdst, str(why)))
if __name__ == '__main__':
print host('/a/b/c/d-e-f')
print host('//a/b//c/d-e-f')
print shell('/w/x/y/z')
print basename('/as/sd/df/fg/me.txt')
print dirname('/as/sd/df/fg/me.txt')
print join('/d', 'g', '/tyty/fgfg')
print(host('/a/b/c/d-e-f'))
print(host('//a/b//c/d-e-f'))
print(shell('/w/x/y/z'))
print(basename('/as/sd/df/fg/me.txt'))
print(dirname('/as/sd/df/fg/me.txt'))
print(join('/d', 'g', '/tyty/fgfg'))
windows = True
print host('/a/b/c/d-e-f')
print host('//a/b//c/d-e-f')
print shell('/w/x/y/z')
print shell('w:/x/y/z')
print basename('x:/sd/df/fg/me.txt')
print dirname('x:/sd/df/fg/me.txt')
print join('s:/d/e\\f/g', '/h', '/tyty/zxzx', '\\mm\\nn/p')
print(host('/a/b/c/d-e-f'))
print(host('//a/b//c/d-e-f'))
print(shell('/w/x/y/z'))
print(shell('w:/x/y/z'))
print(basename('x:/sd/df/fg/me.txt'))
print(dirname('x:/sd/df/fg/me.txt'))
print(join('s:/d/e\\f/g', '/h', '/tyty/zxzx', '\\mm\\nn/p'))