diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /browser/moz.build | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/moz.build')
| -rw-r--r-- | browser/moz.build | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/browser/moz.build b/browser/moz.build deleted file mode 100644 index 0985148c0..000000000 --- a/browser/moz.build +++ /dev/null @@ -1,40 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=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/. - -CONFIGURE_SUBST_FILES += ['installer/Makefile'] - -SPHINX_TREES['browser'] = 'docs' - -DIRS += [ - 'base', - 'components', - 'fonts', - 'locales', - 'modules', - 'themes', - 'extensions', -] - -DIRS += [ - 'app', -] - -if CONFIG['MAKENSISU']: - DIRS += ['installer/windows'] - -TEST_DIRS += [ - 'tools/mozscreenshots', -] - -DIST_SUBDIR = 'browser' -export('DIST_SUBDIR') - -if CONFIG['MOZ_ARTIFACT_BUILDS']: - # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact - # code is included by the top-level chrome.manifest. - EXTRA_COMPONENTS += [ - '../build/prebuilt-interfaces.manifest', - ] |