Add Release versions

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 720 matching lines @@
 
   # Parse environment from "set" command above.
   # It looks like this:
   # KEY1=VALUE1\r\n
   # KEY2=VALUE2\r\n
   # ...
   return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
 
 
 def BuildStepMakeAll(pepperdir, platform, directory, step_name,
-                     clean=False, deps=True):
+                     clean=False, deps=True, config='Debug'):

[Sam Clegg, 2013/01/31 20:09:27]

Maybe make this a required (non-default) arg if the only two
call sites are below?

[noelallen1, 2013/01/31 20:59:24]

Those are the only two call sites in this file.  Providing a default gives me
backwards compatibility for the other use cases.

On 2013/01/31 20:09:27, Sam Clegg wrote:

   buildbot_common.BuildStep(step_name)
   make_dir = os.path.join(pepperdir, directory)
   makefile = os.path.join(make_dir, 'Makefile')
   if os.path.isfile(makefile):
     print "\n\nMake: " + make_dir
     if platform == 'win':
       # We need to modify the environment to build host on Windows.
       env = GetWindowsEnvironment()
       make = os.path.join(make_dir, 'make.bat')
     else:
       env = os.environ
       make = 'make'
 
-    extra_args = []
+    extra_args = ['CONFIG='+config]
     if not deps:
       extra_args += ['IGNORE_DEPS=1']
 
     buildbot_common.Run([make, '-j8', 'all_versions'] + extra_args,
                         cwd=os.path.abspath(make_dir), env=env)
     if clean:
       # Clean to remove temporary files but keep the built libraries.
       buildbot_common.Run([make, '-j8', 'clean'] + extra_args,
                           cwd=os.path.abspath(make_dir))
 
 
 def BuildStepBuildLibraries(pepperdir, platform, directory, clean=True):
-  BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries',
-      clean=clean)
+  BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries Debug',
+      clean=clean, config='Debug')
+  BuildStepMakeAll(pepperdir, platform, directory, 'Build Libraries Release',
+      clean=clean, config='Release')
 
 
 def BuildStepGenerateNotice(pepperdir):
   # Look for LICENSE files
   license_filenames_re = re.compile('LICENSE|COPYING')
 
   license_files = []
   for root, _, files in os.walk(pepperdir):
     for filename in files:
       if license_filenames_re.match(filename):
@@ skipping 237 matching lines @@
     BuildStepArchiveBundle('build', pepper_ver, clnumber, tarfile)
     if platform == 'linux':
       BuildStepArchiveBundle('naclports', pepper_ver, clnumber, ports_tarfile)
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))