Rename PNaCl

build/download_utils.py

 #!/usr/bin/python
 # Copyright 2010 The Native Client Authors.  All rights reserved.
 # Use of this source code is governed by a BSD-style license that can
 # be found in the LICENSE file.
 
 """A library to assist automatically downloading files.
 
 This library is used by scripts that download tarballs, zipfiles, etc. as part
 of the build process.
 """
@@ skipping 12 matching lines @@
 PLATFORM_COLLAPSE = {
     'windows': 'windows',
     'win32': 'windows',
     'cygwin': 'windows',
     'linux': 'linux',
     'linux2': 'linux',
     'darwin': 'mac',
     'mac': 'mac',
 }
 
+ARCH_COLLAPSE = {
+    'i386'  : 'x86-32',
+    'i686'  : 'x86-32',
+    'x86_64': 'x86-64',
+}
+
 
 def PlatformName(name=None):
   if name is None:
     name = sys.platform
   return PLATFORM_COLLAPSE[name]
 
+def ArchName(name=None):
+  if name is None:
+    if PlatformName() == 'windows':
+      # TODO(pdox): Figure out how to auto-detect 32-bit vs 64-bit Windows.
+      name = 'i386'
+    else:
+      import platform
+      name = platform.machine()
+  return ARCH_COLLAPSE[name]
 
 def EnsureFileCanBeWritten(filename):
   directory = os.path.dirname(filename)
   if not os.path.exists(directory):
     os.makedirs(directory)
 
 
 def WriteData(filename, data):
   EnsureFileCanBeWritten(filename)
   f = open(filename, 'wb')
@@ skipping 69 matching lines @@
   Retry(shutil.move, src, dst)
 
 
 def RemoveDir(path):
   if os.path.exists(path):
     Retry(shutil.rmtree, path)
 
 
 def RemoveFile(path):
   if os.path.exists(path):
-    Retry(os.unlink, path)
+    Retry(os.unlink, path)