Issue 6103 - Use new buildtools.build interface and fixed uncommited changes warning

ensure_dependencies.py

 #!/usr/bin/env python
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 import os
 import posixpath
 import re
@@ skipping 26 matching lines @@
   adblockplus = adblockplus hg:893426c6a6ab git:git@github.com:user/adblockplus.git@b2ffd52b
   # Clone the adblockpluschrome repository into the adblockpluschrome directory,
   # from a specific Git repository, specifying the revision ID.
   adblockpluschrome = git:git@github.com:user/adblockpluschrome.git@1fad3a7
 '''
 
 SKIP_DEPENDENCY_UPDATES = os.environ.get(
     'SKIP_DEPENDENCY_UPDATES', ''
 ).lower() not in ('', '0', 'false')
 
+NPM_LOCKFILE = '.npm_install_lock'

[saroyanm, 2017/11/28 14:49:15]

Those are the changes which were updated after dependency update in
https://issues.adblockplus.org/ticket/6102

+
 
 class Mercurial():
     def istype(self, repodir):
         return os.path.exists(os.path.join(repodir, '.hg'))
 
     def clone(self, source, target):
         if not source.endswith('/'):
             source += '/'
         subprocess.check_call(['hg', 'clone', '--quiet', '--noupdate', source, target])
 
@@ skipping 207 matching lines @@
 
         # In case a package.json does not exist at all or if there are no
         # production dependencies declared, we don't need to run npm and can
         # bail out early.
         if not package_data.get('dependencies', False):
             return
     except IOError:
         return
 
     try:
-        cmd = ['npm', 'install', '--only=production', '--loglevel=warn']
+        # Create an empty file, which gets deleted after successfully
+        # installing Node.js dependencies.
+        lockfile_path = os.path.join(target, NPM_LOCKFILE)
+        open(lockfile_path, 'a').close()
+
+        if os.name == 'nt':
+            # Windows' CreateProcess() (called by subprocess.Popen()) only
+            # resolves executables ending in .exe. The windows installation of
+            # Node.js only provides a npm.cmd, which is executable but won't
+            # be recognized as such by CreateProcess().
+            npm_exec = 'npm.cmd'
+        else:
+            npm_exec = 'npm'
+
+        cmd = [npm_exec, 'install', '--only=production', '--loglevel=warn',
+               '--no-package-lock', '--no-optional']
         subprocess.check_output(cmd, cwd=target)
 
+        repo_types[vcs].ignore(os.path.join(target, NPM_LOCKFILE), target)
         repo_types[vcs].ignore(os.path.join(target, 'node_modules'), target)
+
+        os.remove(lockfile_path)
     except OSError as e:
         import errno
         if e.errno == errno.ENOENT:
             logging.error('Failed to install Node.js dependencies for %s,'
                           ' please ensure Node.js is installed.', target)
         else:
             raise
 
 
 def ensure_repo(parentrepo, parenttype, target, type, root, sourcename):
@@ skipping 70 matching lines @@
                 vcs = key
         source, rev = merge_seqs(sources.get('*'), sources.get(vcs))
 
         if not (vcs and source and rev):
             logging.warning('No valid source / revision found to create %s' % target)
             continue
 
         repo_cloned = ensure_repo(repodir, parenttype, target, vcs,
                                   _root.get(vcs, ''), source)
         repo_updated = update_repo(target, vcs, rev)
-        if repo_cloned or repo_updated:
+        recent_npm_failed = os.path.exists(os.path.join(target, NPM_LOCKFILE))
+        if repo_cloned or repo_updated or recent_npm_failed:
             resolve_npm_dependencies(target, vcs)
         resolve_deps(target, level + 1, self_update=False,
                      overrideroots=overrideroots, skipdependencies=skipdependencies)
 
     if self_update and '_self' in config and '*' in config['_self']:
         source = safe_join(repodir, config['_self']['*'])
         try:
             with io.open(source, 'rb') as handle:
                 sourcedata = handle.read()
         except IOError as e:
@@ skipping 38 matching lines @@
     args = parser.parse_args()
 
     if args.quiet:
         logging.disable(logging.INFO)
 
     repos = args.repos
     if not len(repos):
         repos = [os.path.dirname(__file__)]
     for repo in repos:
         resolve_deps(repo)