Fix issue 7005:

tools/create_sdk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 # A script which will be invoked from gyp to create an SDK.
 #
 # Usage: create_sdk.py sdk_directory
 #
@@ skipping 41 matching lines @@
 
 
 
 import os
 import re
 import sys
 import subprocess
 import tempfile
 import utils
 
+HOST_OS = utils.GuessOS()
+
 # TODO(dgrove): Only import modules following Google style guide.
 from os.path import basename, dirname, join, realpath, exists, isdir
 
 # TODO(dgrove): Only import modules following Google style guide.
 from shutil import copyfile, copymode, copytree, ignore_patterns, rmtree, move
 
 def ReplaceInFiles(paths, subs):
   '''Reads a series of files, applies a series of substitutions to each, and
      saves them back out. subs should by a list of (pattern, replace) tuples.'''
   for path in paths:
     contents = open(path).read()
     for pattern, replace in subs:
       contents = re.sub(pattern, replace, contents)
 
     dest = open(path, 'w')
     dest.write(contents)
     dest.close()
 
 
 def Copy(src, dest):
   copyfile(src, dest)
   copymode(src, dest)
 
 # TODO(zundel): this excludes the analyzer from the sdk build until builders
 # have all prerequisite software installed.  Also update dart.gyp.
 def ShouldCopyAnalyzer():
-  os = utils.GuessOS()
-  return os == 'linux' or os == 'macos'
+  return HOST_OS == 'linux' or HOST_OS == 'macos'
 
 
 def CopyShellScript(src_file, dest_dir):
   '''Copies a shell/batch script to the given destination directory. Handles
      using the appropriate platform-specific file extension.'''
   file_extension = ''
-  if utils.GuessOS() == 'win32':
+  if HOST_OS == 'win32':
     file_extension = '.bat'
 
   src = src_file + file_extension
   dest = join(dest_dir, basename(src_file) + file_extension)
   Copy(src, dest)
 
 
 def CopyDartScripts(home, build_dir, sdk_root, version):
   if version:
     ReplaceInFiles([os.path.join(sdk_root, 'lib', '_internal', 'compiler',
@@ skipping 35 matching lines @@
   BIN = join(SDK_tmp, 'bin')
   os.makedirs(BIN)
 
   # Copy the Dart VM binary and the Windows Dart VM link library
   # into sdk/bin.
   #
   # TODO(dgrove) - deal with architectures that are not ia32.
   build_dir = os.path.dirname(argv[1])
   dart_file_extension = ''
   analyzer_file_extension = ''
-  if utils.GuessOS() == 'win32':
+  if HOST_OS == 'win32':
     dart_file_extension = '.exe'
     analyzer_file_extension = '.bat'  # TODO(zundel): test on Windows
     dart_import_lib_src = join(HOME, build_dir, 'dart.lib')
     dart_import_lib_dest = join(BIN, 'dart.lib')
     copyfile(dart_import_lib_src, dart_import_lib_dest)
   dart_src_binary = join(HOME, build_dir, 'dart' + dart_file_extension)
   dart_dest_binary = join(BIN, 'dart' + dart_file_extension)
   copyfile(dart_src_binary, dart_dest_binary)
   copymode(dart_src_binary, dart_dest_binary)
-  if utils.GuessOS() != 'win32':
+  # Strip the binaries on platforms where that is supported.
+  if HOST_OS == 'linux':
     subprocess.call(['strip', dart_dest_binary])
+  elif HOST_OS == 'macos':
+    subprocess.call(['strip', '-x', dart_dest_binary])
 
   if ShouldCopyAnalyzer():
     # Copy analyzer into sdk/bin
     ANALYZER_HOME = join(HOME, build_dir, 'analyzer')
     dart_analyzer_src_binary = join(ANALYZER_HOME, 'bin', 'dart_analyzer')
     dart_analyzer_dest_binary = join(BIN,
         'dart_analyzer' + analyzer_file_extension)
     copyfile(dart_analyzer_src_binary, dart_analyzer_dest_binary)
     copymode(dart_analyzer_src_binary, dart_analyzer_dest_binary)
 
@@ skipping 68 matching lines @@
       os.makedirs(dest_dir)
       dest_file = join (ANALYZER_DEST, jarToCopy)
       src_file = join(ANALYZER_HOME, 'util', 'analyzer', jarToCopy)
       copyfile(src_file, dest_file)
 
   # Create and populate util/pub.
   copytree(join(HOME, 'utils', 'pub'), join(UTIL, 'pub'),
            ignore=ignore_patterns('.svn', 'sdk'))
 
   # Copy in 7zip for Windows.
-  if utils.GuessOS() == 'win32':
+  if HOST_OS == 'win32':
     copytree(join(HOME, 'third_party', '7zip'),
              join(join(UTIL, 'pub'), '7zip'),
              ignore=ignore_patterns('.svn'))
 
     ReplaceInFiles([
         join(UTIL, 'pub', 'io.dart'),
       ], [
         ("var pathTo7zip = '../../third_party/7zip/7za.exe';",
          "var pathTo7zip = '7zip/7za.exe';"),
       ])
 
   # Copy in cURL on all operating systems, since we need the certificates file
   # even outside Windows. Leave out the EXE on non-Windows systems, though.
-  curl_ignore_patterns = ignore_patterns('.svn') if utils.GuessOS() == 'win32' \
+  curl_ignore_patterns = ignore_patterns('.svn') if HOST_OS == 'win32' \
       else ignore_patterns('.svn', '*.exe')
   copytree(join(HOME, 'third_party', 'curl'),
            join(join(UTIL, 'pub'), 'curl'),
            ignore=curl_ignore_patterns)
 
   ReplaceInFiles([
       join(UTIL, 'pub', 'curl_client.dart'),
     ], [
       ("var pathToCurl = '../../third_party/curl/curl.exe';",
        "var pathToCurl = 'curl/curl.exe';"),
@@ skipping 25 matching lines @@
     with open(os.path.join(SDK_tmp, 'revision'), 'w') as f:
       f.write(revision + '\n')
       f.close()
 
   Copy(join(HOME, 'README.dart-sdk'), join(SDK_tmp, 'README'))
 
   move(SDK_tmp, SDK)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))