Switch devenv to use pkg packages

lib/naclports/binary_package.py

 # Copyright (c) 2014 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.
 
 import os
 import posixpath
 import shutil
 import stat
 import tarfile
 
 from naclports import configuration, package, util, error
 
 PAYLOAD_DIR = 'payload'
 INSTALL_PREFIX = '/naclports-dummydir'
 
 ELF_MAGIC = '\x7fELF'
+PEXE_MAGIC = 'PEXE'
+
+def MakeDirIfNeeded(filename):
+  dirname = os.path.dirname(filename)
+  if not os.path.isdir(dirname):
+    util.Makedirs(dirname)
+
 
 def IsElfFile(filename):
   if os.path.islink(filename):
     return False
   with open(filename) as f:
     header = f.read(4)
   return header == ELF_MAGIC
 
 
+def IsPexeFile(filename):
+  if os.path.islink(filename):
+    return False
+  with open(filename) as f:
+    header = f.read(4)
+  return header == PEXE_MAGIC
+
+
 def InstallFile(filename, old_root, new_root):
   """Install a single file by moving it into a new location.
 
   Args:
     filename: Relative name of file to install.
     old_root: The current location of the file.
     new_root: The new desired root for the file.
   """
   oldname = os.path.join(old_root, filename)
 
   util.LogVerbose('install: %s' % filename)
 
   newname = os.path.join(new_root, filename)
   dirname = os.path.dirname(newname)
   if not os.path.isdir(dirname):
     util.Makedirs(dirname)
   os.rename(oldname, newname)
 
   # When install binarie ELF files into the toolchain direcoties, remove
   # the X bit so that they do not found when searching the PATH.
-  if IsElfFile(newname):
+  if IsElfFile(newname) or IsPexeFile(newname):
     mode = os.stat(newname).st_mode
     mode = mode & ~(stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
     os.chmod(newname, mode)
 
 
 
 def RelocateFile(filename, dest):
   """Perform in-place mutations on file contents to handle new location.
 
   There are a few file types that have absolute pathnames embedded
@@ skipping 85 matching lines @@
     """Extract the contents of the pkg_info file from the binary package."""
     with tarfile.open(self.filename) as tar:
       return tar.extractfile('./pkg_info').read()
 
   def Install(self, force):
     """Install binary package into toolchain directory."""
     with util.InstallLock(self.config):
       self._Install(force)
 
   def _Install(self, force):
+    if self.TOOLCHAIN_INSTALL != '0':
+        self._InstallFiles(force)
+    self.WriteStamp()
+
+  def _InstallFiles(self, force):
     dest = util.GetInstallRoot(self.config)
     dest_tmp = os.path.join(dest, 'install_tmp')
     if os.path.exists(dest_tmp):
       shutil.rmtree(dest_tmp)
 
     if self.IsAnyVersionInstalled():
       raise error.Error('package already installed: %s' % self.InfoString())
 
     self.LogStatus('Installing')
     util.LogVerbose('installing from: %s' % self.filename)
@@ skipping 25 matching lines @@
 
         for name in names:
           InstallFile(name, payload_tree, dest)
     finally:
       shutil.rmtree(dest_tmp)
 
     for name in names:
       RelocateFile(name, dest)
 
     self.WriteFileList(names)
-    self.WriteStamp()
 
   def WriteStamp(self):
     """Write stamp file containing pkg_info."""
     filename = util.GetInstallStamp(self.NAME, self.config)
+    MakeDirIfNeeded(filename)
     util.LogVerbose('stamp: %s' % filename)
     pkg_info = self.GetPkgInfo()
     with open(filename, 'w') as f:
       f.write(pkg_info)
 
   def WriteFileList(self, file_names):
     """Write the file list for this package."""
     filename = self.GetListFile()
-    dirname = os.path.dirname(filename)
-    if not os.path.isdir(dirname):
-      util.Makedirs(dirname)
+    MakeDirIfNeeded(filename)
     with open(filename, 'w') as f:
       for name in file_names:
         f.write(name + '\n')