summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-11-16 12:47:54 -0500
committerMoonchild <moonchild@palemoon.org>2020-11-18 10:59:16 +0000
commit976ccaa9223740c743d18824f12a521ed5a5601b (patch)
treebcae91cb897085a3e595182c6321d7f2a9273a01 /toolkit
parent8b3375e2c202c04935ca056cc8dc389a08e47bb6 (diff)
downloadUXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar
UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar.gz
UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar.lz
UXP-976ccaa9223740c743d18824f12a521ed5a5601b.tar.xz
UXP-976ccaa9223740c743d18824f12a521ed5a5601b.zip
Issue #251 - Move chrome packaging options to ac configure
Also adds options for new functionality in #1683
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/moz.configure30
1 files changed, 0 insertions, 30 deletions
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 863327751..8d399be67 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -345,36 +345,6 @@ set_config('MOZ_FMP4', fmp4)
set_define('MOZ_FMP4', fmp4)
add_old_configure_assignment('MOZ_FMP4', fmp4)
-# Miscellaneous
-# ==============================================================
-option(name='--enable-chrome-format',
- help='Select FORMAT of chrome files during packaging.',
- nargs=1,
- choices=('omni', 'jar', 'flat'),
- default='omni')
-
-@depends('--enable-chrome-format')
-def packager_format(value):
- return value[0]
-
-set_config('MOZ_PACKAGER_FORMAT', packager_format)
-
-@depends(host, build_project)
-def jar_maker_format(host, build_project):
- # Multilocales for mobile/android use the same mergedirs for all locales,
- # so we can't use symlinks for those builds.
- if host.os == 'WINNT':
- return 'flat'
- return 'symlink'
-
-set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format)
-
-@depends(toolkit)
-def omnijar_name(toolkit):
- return 'omni.ja'
-
-set_config('OMNIJAR_NAME', omnijar_name)
-
# Permissions system
# ==============================================================
option(name='--disable-permissions',