sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #181 from jvrsantacruz/next

Browse source 
Improves acprep python3 compatibility
This commit is contained in:
John Wiegley 2013-04-27 15:10:02 -07:00
commit 86111ecffb
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
acprep
View file

@ -206,7 +206,7 @@ class CommandLineApp(object):
except KeyboardInterrupt: except KeyboardInterrupt:
exit_code = self.handleInterrupt() exit_code = self.handleInterrupt()
except SystemExit, msg: except SystemExit as msg:
exit_code = msg.args[0] exit_code = msg.args[0]
except Exception: except Exception:
@ -244,7 +244,7 @@ class PrepareBuild(CommandLineApp):
} }
for varname in self.envvars.keys(): for varname in self.envvars.keys():
if os.environ.has_key(varname): if varname in os.environ:
self.envvars[varname] = os.environ[varname] self.envvars[varname] = os.environ[varname]
if varname.endswith('FLAGS'): if varname.endswith('FLAGS'):
@ -327,7 +327,7 @@ class PrepareBuild(CommandLineApp):
if args: if args:
cmd = args[0] cmd = args[0]
if not PrepareBuild.__dict__.has_key('phase_' + cmd): if 'phase_' + cmd not in PrepareBuild.__dict__:
self.log.error("Unknown build phase: " + cmd + "\n") self.log.error("Unknown build phase: " + cmd + "\n")
sys.exit(1) sys.exit(1)
else: else:
@ -344,22 +344,22 @@ class PrepareBuild(CommandLineApp):
def execute(self, *args): def execute(self, *args):
try: try:
self.log.debug('Executing command: ' + string.join(args, ' ')) self.log.debug('Executing command: ' + ' '.join(args))
retcode = call(args, shell=False) retcode = call(args, shell=False)
if retcode < 0: if retcode < 0:
self.log.error("Child was terminated by signal", -retcode) self.log.error("Child was terminated by signal", -retcode)
sys.exit(1) sys.exit(1)
elif retcode != 0: elif retcode != 0:
self.log.error("Execution failed: " + string.join(args, ' ')) self.log.error("Execution failed: " + ' '.join(args))
sys.exit(1) sys.exit(1)
except OSError, e: except OSError as e:
self.log.error("Execution failed: " + e) self.log.error("Execution failed: " + e)
sys.exit(1) sys.exit(1)
def get_stdout(self, *args): def get_stdout(self, *args):
try: try:
self.log.debug('Executing command: ' + string.join(args, ' ')) self.log.debug('Executing command: ' + ' '.join(args))
proc = Popen(args, shell=False, stdout=PIPE) proc = Popen(args, shell=False, stdout=PIPE)
stdout = proc.stdout.read() stdout = proc.stdout.read()
@ -369,10 +369,10 @@ class PrepareBuild(CommandLineApp):
-retcode) -retcode)
sys.exit(1) sys.exit(1)
elif retcode != 0: elif retcode != 0:
self.log.error("Execution failed: " + string.join(args, ' ')) self.log.error("Execution failed: " + ' '.join(args))
sys.exit(1) sys.exit(1)
return stdout[:-1] return stdout[:-1]
except OSError, e: except OSError as e:
self.log.error("Execution failed:" + e) self.log.error("Execution failed:" + e)
sys.exit(1) sys.exit(1)
@ -452,7 +452,7 @@ class PrepareBuild(CommandLineApp):
def phase_products(self, *args): def phase_products(self, *args):
self.log.info('Executing phase: products') self.log.info('Executing phase: products')
print self.products_directory() print(self.products_directory())
def phase_info(self, *args): def phase_info(self, *args):
self.log.info('Executing phase: info') self.log.info('Executing phase: info')
@ -527,7 +527,7 @@ class PrepareBuild(CommandLineApp):
'texlive-xetex', 'doxygen', 'graphviz', 'texinfo', 'texlive-xetex', 'doxygen', 'graphviz', 'texinfo',
'lcov', 'sloccount' 'lcov', 'sloccount'
] + BoostInfo.dependencies('darwin') ] + BoostInfo.dependencies('darwin')
self.log.info('Executing: ' + string.join(packages, ' ')) self.log.info('Executing: ' + ' '.join(packages))
self.execute(*packages) self.execute(*packages)
elif exists('/sw/bin/fink'): elif exists('/sw/bin/fink'):
self.log.info('Looks like you are using Fink on OS X') self.log.info('Looks like you are using Fink on OS X')
@ -616,7 +616,7 @@ class PrepareBuild(CommandLineApp):
self.log.info('I do not recognize your version of Ubuntu!') self.log.info('I do not recognize your version of Ubuntu!')
packages = None packages = None
if packages: if packages:
self.log.info('Executing: ' + string.join(packages, ' ')) self.log.info('Executing: ' + ' '.join(packages))
self.execute(*packages) self.execute(*packages)
if exists('/etc/redhat-release'): if exists('/etc/redhat-release'):
@ -646,7 +646,7 @@ class PrepareBuild(CommandLineApp):
#'lcov', #'lcov',
#'sloccount' #'sloccount'
] ]
self.log.info('Executing: ' + string.join(packages, ' ')) self.log.info('Executing: ' + ' '.join(packages))
self.execute(*packages) self.execute(*packages)
######################################################################### #########################################################################
@ -678,7 +678,7 @@ class PrepareBuild(CommandLineApp):
self.configure_args.append(self.source_dir) self.configure_args.append(self.source_dir)
def setup_for_system(self): def setup_for_system(self):
system = self.get_stdout('uname', '-s') system = str(self.get_stdout('uname', '-s'))
self.log.info('System type is => ' + system) self.log.info('System type is => ' + system)
if self.options.enable_doxygen: if self.options.enable_doxygen:
@ -695,8 +695,7 @@ class PrepareBuild(CommandLineApp):
def setup_flavor(self): def setup_flavor(self):
self.setup_for_system() self.setup_for_system()
if not PrepareBuild.__dict__.has_key('setup_flavor_' + if 'setup_flavor_' + self.current_flavor not in PrepareBuild.__dict__:
self.current_flavor):
self.log.error('Unknown build flavor "%s"' % self.current_flavor) self.log.error('Unknown build flavor "%s"' % self.current_flavor)
sys.exit(1) sys.exit(1)
@ -725,7 +724,7 @@ class PrepareBuild(CommandLineApp):
self.log.debug('Final value of %s: %s' % self.log.debug('Final value of %s: %s' %
(var, self.envvars[var])) (var, self.envvars[var]))
elif self.envvars.has_key(var): elif var in self.envvars:
del self.envvars[var] del self.envvars[var]
######################################################################### #########################################################################
@ -795,8 +794,8 @@ class PrepareBuild(CommandLineApp):
sys.exit(1) sys.exit(1)
for var in ('CXX', 'CXXFLAGS', 'LDFLAGS'): for var in ('CXX', 'CXXFLAGS', 'LDFLAGS'):
if self.envvars.has_key(var) and self.envvars[var] and \ if self.envvars.get(var) and (var.endswith('FLAGS')
(var.endswith('FLAGS') or exists(self.envvars[var])): or exists(self.envvars[var])):
if var == 'CXX': if var == 'CXX':
conf_args.append('-DCMAKE_CXX_COMPILER=%s' % conf_args.append('-DCMAKE_CXX_COMPILER=%s' %
self.envvars[var]) self.envvars[var])
@ -848,7 +847,7 @@ class PrepareBuild(CommandLineApp):
self.log.error("Child was terminated by signal", -retcode) self.log.error("Child was terminated by signal", -retcode)
sys.exit(1) sys.exit(1)
elif retcode != 0: elif retcode != 0:
self.log.error("Execution failed: " + string.join(conf_args, ' ')) self.log.error("Execution failed: " + ' '.join(conf_args))
sys.exit(1) sys.exit(1)
else: else:
self.log.debug('configure does not need to be run') self.log.debug('configure does not need to be run')
@ -1031,7 +1030,7 @@ class PrepareBuild(CommandLineApp):
def phase_help(self, *args): def phase_help(self, *args):
self.option_parser.print_help() self.option_parser.print_help()
print """ print("""
Of the optional ARGS, the first is an optional build FLAVOR, with the default Of the optional ARGS, the first is an optional build FLAVOR, with the default
being 'debug': being 'debug':
@ -1077,7 +1076,7 @@ Here are some real-world examples:
./acprep ./acprep
./acprep --python ./acprep --python
./acprep opt make ./acprep opt make
./acprep make doc -- -DBUILD_WEB_DOCS=1""" ./acprep make doc -- -DBUILD_WEB_DOCS=1""")
sys.exit(0) sys.exit(0)
PrepareBuild().run() PrepareBuild().run()