Switch devenv to use pkg packages

lib/naclports/source_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 contextlib
 import os
 import re
 import subprocess
 import sys
 import tempfile
@@ skipping 165 matching lines @@
       raise Error('Invalid package folder: %s' % pkg_root)
 
     super(SourcePackage, self).__init__(info_file)
     if self.NAME != os.path.basename(self.root):
       raise Error('%s: package NAME must match directory name' % self.info)
 
   def GetInstallLocation(self):
     install_dir = 'install_%s' % util.arch_to_pkgarch[self.config.arch]
     if self.config.arch != self.config.toolchain:
        install_dir += '_' + self.config.toolchain
+    if self.config.config_name == 'debug':
+       install_dir += '_debug'
     return os.path.join(paths.BUILD_ROOT, self.NAME, install_dir, 'payload')
 
   def GetBuildLocation(self):
     package_dir = self.ARCHIVE_ROOT or '%s-%s' % (self.NAME, self.VERSION)
     return os.path.join(paths.BUILD_ROOT, self.NAME, package_dir)
 
   def GetPatchFile(self):
     return os.path.join(self.root, 'nacl.patch')
 
   def GetArchiveFilename(self):
@@ skipping 79 matching lines @@
         from_source = True
 
     if from_source:
       self.Build(build_deps, force)
 
     if self.IsAnyVersionInstalled():
       installed_pkg = self.GetInstalledPackage()
       installed_pkg.LogStatus('Uninstalling existing')
       installed_pkg.DoUninstall()
 
-    if self.TOOLCHAIN_INSTALL != '0':
-      binary_package.BinaryPackage(package_file).Install(force)
+    binary_package.BinaryPackage(package_file).Install(force)
 
   def GetInstalledPackage(self):
     return package.CreateInstalledPackage(self.NAME, self.config)
 
   def CreatePkgFile(self):
     """Create and pkg file for use with the FreeBSD pkg tool.
 
-    This step is designed to run after the build scripts and will
-    package up any files published by the PublishByArchForDevEnv
-    step.
+    Create a package from the result of the package's InstallStep.
     """
     install_dir = self.GetInstallLocation()
     if not os.path.exists(install_dir):
+      Log('Skiping pkg creation. Install dir not found: %s' % install_dir)
       return
 
     abi = 'pkg_' + self.config.toolchain
     if self.config.arch != self.config.toolchain:
       abi += "_" + util.arch_to_pkgarch[self.config.arch]
     abi_dir = os.path.join(paths.PUBLISH_ROOT, abi)
     pkg_file = os.path.join(abi_dir, '%s-%s.tbz' % (self.NAME,
       self.VERSION))
-
     util.Makedirs(abi_dir)
-
     deps = self.DEPENDS
     if self.config.toolchain != 'glibc':
         deps = []
     bsd_pkg.CreatePkgFile(self.NAME, self.VERSION, self.config.arch,
         self.GetInstallLocation(), pkg_file, deps)
 
 
   def Build(self, build_deps, force=None):
     self.CheckBuildable()
 
@@ skipping 448 matching lines @@
   if os.path.isdir(package_name):
     return SourcePackage(package_name, config)
 
   for subdir in DEFAULT_LOCATIONS:
     pkg_root = os.path.join(paths.NACLPORTS_ROOT, subdir, package_name)
     info = os.path.join(pkg_root, 'pkg_info')
     if os.path.exists(info):
       return SourcePackage(pkg_root, config)
 
   raise Error("Package not found: %s" % package_name)