← Back to branch summary

~hjd/ubuntu/wily/gyp/debian-merged

« back to all changes in this revision

Viewing changes to gyptest.py

  • Committer: Hans Joachim Desserud
  • Date: 2015-10-31 12:46:59 UTC
  • mfrom: (6.2.6 sid)
  • Revision ID: hans_joachim_desserud-20151031124659-lzxekr6woskh4k0b
Merge latest Debian version

Show diffs side-by-side

added added

removed removed

Lines of Context:
gyptest.py
13
13
import subprocess
14
14
import sys
15
15
 
16
 
class CommandRunner:
 
16
class CommandRunner(object):
17
17
  """
18
18
  Executor class for commands, including "commands" implemented by
19
19
  Python functions.
117
117
    return self.execute(command, stdout, stderr)
118
118
 
119
119
 
120
 
class Unbuffered:
 
120
class Unbuffered(object):
121
121
  def __init__(self, fp):
122
122
    self.fp = fp
123
123
  def write(self, arg):
176
176
  if opts.path:
177
177
    extra_path = [os.path.abspath(p) for p in opts.path]
178
178
    extra_path = os.pathsep.join(extra_path)
179
 
    os.environ['PATH'] += os.pathsep + extra_path
 
179
    os.environ['PATH'] = extra_path + os.pathsep + os.environ['PATH']
180
180
 
181
181
  if not args:
182
182
    if not opts.all:
216
216
  else:
217
217
    # TODO:  not duplicate this mapping from pylib/gyp/__init__.py
218
218
    format_list = {
 
219
      'aix5':     ['make'],
219
220
      'freebsd7': ['make'],
220
221
      'freebsd8': ['make'],
221
222
      'openbsd5': ['make'],
223
224
      'win32':    ['msvs', 'ninja'],
224
225
      'linux2':   ['make', 'ninja'],
225
226
      'linux3':   ['make', 'ninja'],
226
 
      'darwin':   ['make', 'ninja', 'xcode'],
 
227
      'darwin':   ['make', 'ninja', 'xcode', 'xcode-ninja'],
227
228
    }[sys.platform]
228
229
 
229
230
  for format in format_list: