Bug 1265374 - Move check_prog for archive programs into toolkit/moz.configure; r=glandium
authorMs2ger <Ms2ger@gmail.com>
Wed, 20 Apr 2016 11:47:33 +0200
changeset 322058 1e5e34826bd992c37b8bdebbd2c598d2d0fd9629
parent 322051 182a164b91ecba718b49f260f241f6cf2d22cfd3
child 322060 c10de64dc242b252b57bb0244e464e599c6dbb27
push idunknown
push userunknown
push dateunknown
reviewersglandium
bugs1265374
milestone48.0a1
Bug 1265374 - Move check_prog for archive programs into toolkit/moz.configure; r=glandium This stops us from requiring them in standalone SpiderMonkey builds.
moz.configure
toolkit/moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -143,20 +143,17 @@ def perl_version_check(min_version):
                 'A full perl installation is required.')
 
 perl_version_check('5.006')
 
 
 # Miscellaneous programs
 # ==============================================================
 check_prog('DOXYGEN', ('doxygen',), allow_missing=True)
-check_prog('TAR', ('gnutar', 'gtar', 'tar'))
-check_prog('UNZIP', ('unzip',))
 check_prog('XARGS', ('xargs',))
-check_prog('ZIP', ('zip',))
 
 @depends(target)
 def extra_programs(target):
     if target.kernel == 'Darwin':
         return namespace(
             DSYMUTIL=('dsymutil', 'llvm-dsymutil'),
             GENISOIMAGE=('genisoimage',),
         )
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -385,8 +385,15 @@ def omnijar_name(toolkit):
     # packaging so that the resources in the omnijar are considered
     # as rooted at / and not as rooted at assets/ (which again is
     # not the case on desktop: there are omnijars rooted at webrtc/,
     # etc). packager.mk handles changing the rooting of the single
     # omnijar.
     return 'assets/omni.ja' if toolkit == 'android' else 'omni.ja'
 
 set_config('OMNIJAR_NAME', omnijar_name)
+
+# Miscellaneous programs
+# ==============================================================
+
+check_prog('TAR', ('gnutar', 'gtar', 'tar'))
+check_prog('UNZIP', ('unzip',))
+check_prog('ZIP', ('zip',))