Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1253431 part 7 - Remove SDK_BINARY; r=gps

Browse Source 
MozReview-Commit-ID: 4RmjsX966Qh

--HG--
extra : rebase_source : 0d9d94ed98ae8f1cfb9d5787edc1336ce1ee6785
This commit is contained in:
Mike Shal 2016-03-03 14:23:57 -05:00
parent 4bd051f9d7
commit 053369e67e
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/rules.mk
View File

@ -262,7 +262,6 @@ SIMPLE_PROGRAMS :=
HOST_LIBRARY :=
HOST_PROGRAM :=
HOST_SIMPLE_PROGRAMS :=
SDK_BINARY := $(filter %.py,$(SDK_BINARY))
SDK_LIBRARY :=
endif
@ -1170,18 +1169,6 @@ INSTALL_TARGETS += SDK_LIBRARY
endif
endif # SDK_LIBRARY
# SDK_BINARY is still used in various makefiles for non-products of the
# compilation, so we need to keep that running on the libs tier.
ifneq (,$(strip $(SDK_BINARY)))
ifndef NO_DIST_INSTALL
SDK_BINARY_FILES := $(SDK_BINARY)
SDK_BINARY_DEST := $(SDK_BIN_DIR)
# SDK_BINARY_TARGET is set in xpcom/idl-parser/Makefile.in
SDK_BINARY_TARGET ?= libs target
INSTALL_TARGETS += SDK_BINARY
endif
endif # SDK_BINARY
################################################################################
# CHROME PACKAGING

2
js/xpconnect/shell/Makefile.in
View File

@ -3,6 +3,4 @@
# 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/.
SDK_BINARY = $(PROGRAM)
NSDISTMODE = copy

5
js/xpconnect/shell/moz.build
View File

@ -6,6 +6,11 @@
GeckoProgram('xpcshell', linkage='dependent')
if CONFIG['COMPILE_ENVIRONMENT']:
SDK_FILES.bin += [
'!xpcshell%s' % CONFIG['BIN_SUFFIX'],
]
SOURCES += [
'xpcshell.cpp',
]

8
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -823,6 +823,11 @@ class TreeMetadataEmitter(LoggingMixin):
local_include.full_path), context)
yield LocalInclude(context, local_include)
for obj in self._handle_linkables(context, passthru):
yield obj
generated_files.update(['%s%s' % (k, self.config.substs.get('BIN_SUFFIX', '')) for k in self._binaries.keys()])
components = []
for var, cls in (
('BRANDING_FILES', BrandingFiles),
@ -901,9 +906,6 @@ class TreeMetadataEmitter(LoggingMixin):
Manifest('components',
mozpath.basename(c)))
for obj in self._handle_linkables(context, passthru):
yield obj
for obj in self._process_test_manifests(context):
yield obj