
""" Compile step """

from utils import shell_utils
from build_step import BuildStep
from slave import slave_utils
import os
import sys


class Compile(BuildStep):
  def _Run(self):
    # Add gsutil to PATH
    gsutil = slave_utils.GSUtilSetup()
    os.environ['PATH'] += os.pathsep + os.path.dirname(gsutil)

    # Override the default boto file with one which works with ChromeOS utils.
    cros_boto_file = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                  os.pardir, os.pardir, 'site_config',
                                  '.boto_cros')

    # Run the chromeos_make script.
    make_cmd = os.path.join('platform_tools', 'chromeos', 'bin',
                            'chromeos_make')
    cmd = [make_cmd,
           '-d', self._args['board'],
           self._args['target'],
           '--cros-boto-file', cros_boto_file,
           'BUILDTYPE=%s' % self._configuration,
           ]

    cmd.extend(self._default_make_flags)
    cmd.extend(self._make_flags)
    shell_utils.Bash(cmd)


if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(Compile))


""" Compile step """

from utils import shell_utils
from build_step import BuildStep
from slave import slave_utils
import os
import sys


class Compile(BuildStep):
  def _Run(self):
    # Add gsutil to PATH
    gsutil = slave_utils.GSUtilSetup()
    os.environ['PATH'] += os.pathsep + os.path.dirname(gsutil)

    # Run the chromeos_make script.
    make_cmd = os.path.join('platform_tools', 'chromeos', 'bin',
                            'chromeos_make')
    cmd = [make_cmd,
           '-d', self._args['board'],
           self._args['target'],
           'BUILDTYPE=%s' % self._configuration,
           ]

    cmd.extend(self._default_make_flags)
    cmd.extend(self._make_flags)
    shell_utils.Bash(cmd)


if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(Compile))

Remove no longer used extra boto file parameter
Remove no longer used extra boto file parameter

This doesn't break anything, but it isn't needed.
(RunBuilders:Test-ChromeOS-Alex-GMA3150-x86-Debug,Test-ChromeOS-Alex-GMA3150-x86-Release,Perf-ChromeOS-Alex-GMA3150-x86-Release)

R=rmistry@google.com

Review URL: https://codereview.chromium.org/17575017

git-svn-id: 32fc27f4dcfb6c0385cd9719852b95fe6680452d@9745 2bbb7eff-a529-9590-31e7-b0007b416f81

  
  """ Compile step """
  
  from utils import shell_utils
  from build_step import BuildStep
  from slave import slave_utils
  import os
  import sys
  
  
  class Compile(BuildStep):
    def _Run(self):
      # Add gsutil to PATH
      gsutil = slave_utils.GSUtilSetup()
      os.environ['PATH'] += os.pathsep + os.path.dirname(gsutil)
  
-     # Override the default boto file with one which works with ChromeOS utils.
-     cros_boto_file = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                                   os.pardir, os.pardir, 'site_config',
-                                   '.boto_cros')
- 
      # Run the chromeos_make script.
      make_cmd = os.path.join('platform_tools', 'chromeos', 'bin',
                              'chromeos_make')
      cmd = [make_cmd,
             '-d', self._args['board'],
             self._args['target'],
-            '--cros-boto-file', cros_boto_file,
             'BUILDTYPE=%s' % self._configuration,
             ]
  
      cmd.extend(self._default_make_flags)
      cmd.extend(self._make_flags)
      shell_utils.Bash(cmd)
  
  
  if '__main__' == __name__:
    sys.exit(BuildStep.RunBuildStep(Compile))
  
Remove no longer used extra boto file parameter
## Code Before:

""" Compile step """

from utils import shell_utils
from build_step import BuildStep
from slave import slave_utils
import os
import sys


class Compile(BuildStep):
  def _Run(self):
    # Add gsutil to PATH
    gsutil = slave_utils.GSUtilSetup()
    os.environ['PATH'] += os.pathsep + os.path.dirname(gsutil)

    # Override the default boto file with one which works with ChromeOS utils.
    cros_boto_file = os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                  os.pardir, os.pardir, 'site_config',
                                  '.boto_cros')

    # Run the chromeos_make script.
    make_cmd = os.path.join('platform_tools', 'chromeos', 'bin',
                            'chromeos_make')
    cmd = [make_cmd,
           '-d', self._args['board'],
           self._args['target'],
           '--cros-boto-file', cros_boto_file,
           'BUILDTYPE=%s' % self._configuration,
           ]

    cmd.extend(self._default_make_flags)
    cmd.extend(self._make_flags)
    shell_utils.Bash(cmd)


if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(Compile))

## Instruction:
Remove no longer used extra boto file parameter
## Code After:

""" Compile step """

from utils import shell_utils
from build_step import BuildStep
from slave import slave_utils
import os
import sys


class Compile(BuildStep):
  def _Run(self):
    # Add gsutil to PATH
    gsutil = slave_utils.GSUtilSetup()
    os.environ['PATH'] += os.pathsep + os.path.dirname(gsutil)

    # Run the chromeos_make script.
    make_cmd = os.path.join('platform_tools', 'chromeos', 'bin',
                            'chromeos_make')
    cmd = [make_cmd,
           '-d', self._args['board'],
           self._args['target'],
           'BUILDTYPE=%s' % self._configuration,
           ]

    cmd.extend(self._default_make_flags)
    cmd.extend(self._make_flags)
    shell_utils.Bash(cmd)


if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(Compile))
