Bug 1229241 - Reject FINAL_TARGET{,_PP}_FILES along DIST_INSTALL = False. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 27 Nov 2015 21:08:34 +0900
changeset 274839 7b183b8a6116a5f5d65eeccbab97ced59910ef79
parent 274838 b69aaa0c37118c43a5830c721fb40854a3f5c1cc
child 274840 63bfa84f09aa6f7f510b44bc813e562e8456573e
push id68688
push usermh@glandium.org
push dateTue, 01 Dec 2015 05:01:36 +0000
treeherdermozilla-inbound@aad04db89c38 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1229241
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1229241 - Reject FINAL_TARGET{,_PP}_FILES along DIST_INSTALL = False. r=gps
python/mozbuild/mozbuild/frontend/emitter.py
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -688,16 +688,20 @@ class TreeMetadataEmitter(LoggingMixin):
 
         for var, cls in (
             ('FINAL_TARGET_FILES', FinalTargetFiles),
             ('FINAL_TARGET_PP_FILES', FinalTargetPreprocessedFiles),
         ):
             all_files = context.get(var)
             if not all_files:
                 continue
+            if dist_install is False:
+                raise SandboxValidationError(
+                    '%s cannot be used with DIST_INSTALL = False' % var,
+                    context)
             for _, files in all_files.walk():
                 for f in files:
                     path = os.path.join(context.srcdir, f)
                     if not os.path.exists(path):
                         raise SandboxValidationError(
                             'File listed in %s does not exist: %s'
                             % (var, f), context)