Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1266875 - Remove custom install rules; r=chmanchester

Browse Source 
MozReview-Commit-ID: CoWdHidlDrV
This commit is contained in:
Mike Shal 2016-04-18 10:36:07 -04:00
parent b565a3d437
commit a204083dd1
12 changed files with 43 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/shell/Makefile.in
View File

@ -10,11 +10,5 @@ endif
include $(topsrcdir)/config/rules.mk
# People expect the js shell to wind up in the top-level JS dir.
libs::
$(INSTALL) $(IFLAGS2) $(PROGRAM) ..
GARBAGE += ../$(PROGRAM)
install:: $(PROGRAM)
$(SYSINSTALL) $^ $(DESTDIR)$(bindir)

3
js/src/shell/moz.build
View File

@ -59,3 +59,6 @@ if CONFIG['_MSC_VER']:
DEFINES['topsrcdir'] = '%s/js/src' % TOPSRCDIR
FINAL_TARGET_PP_FILES += ['js-gdb.py.in']
OBJDIR_FILES.js.src.shell += ['!/dist/bin/js-gdb.py']
# People expect the js shell to wind up in the top-level JS dir.
OBJDIR_FILES.js.src += ['!js%s' % CONFIG['BIN_SUFFIX']]

25
layout/tools/reftest/Makefile.in
View File

@ -5,37 +5,14 @@
_DEST_DIR = $(DEPTH)/_tests/reftest
_HARNESS_FILES = \
$(srcdir)/b2g_start_script.js \
$(srcdir)/runreftest.py \
$(srcdir)/reftestcommandline.py \
$(srcdir)/reftest-preferences.js \
$(srcdir)/remotereftest.py \
$(srcdir)/runreftestb2g.py \
$(srcdir)/runreftestmulet.py \
$(srcdir)/gaia_lock_screen.js \
$(srcdir)/output.py \
automation.py \
$(topsrcdir)/build/mobile/b2gautomation.py \
$(topsrcdir)/build/mobile/remoteautomation.py \
$(topsrcdir)/testing/mochitest/server.js \
$(topsrcdir)/build/pgo/server-locations.txt \
$(NULL)
include $(topsrcdir)/config/rules.mk
# We're installing to _tests/reftest
TARGET_DEPTH = ../..
include $(topsrcdir)/build/automation-build.mk
$(_DEST_DIR):
$(NSINSTALL) -D $@
$(_HARNESS_FILES): $(_DEST_DIR)
# copy harness and the reftest extension bits to $(_DEST_DIR)
# This needs to happen after jar.mn handling from rules.mk included above.
# The order of the :: rules ensures that.
libs:: $(_HARNESS_FILES) $(addprefix $(_DEST_DIR)/,$(_HARNESS_PP_FILES))
$(INSTALL) $(_HARNESS_FILES) $(_DEST_DIR)
libs::
(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - reftest) | (cd $(_DEST_DIR) && tar -xf -)

18
layout/tools/reftest/moz.build
View File

@ -12,3 +12,21 @@ USE_EXTENSION_MANIFEST = True
JAR_MANIFESTS += ['jar.mn']
FINAL_TARGET_PP_FILES += ['install.rdf']
FINAL_TARGET_FILES += ['bootstrap.js']
GENERATED_FILES += ['automation.py']
TEST_HARNESS_FILES.reftest += [
'!automation.py',
'/build/mobile/b2gautomation.py',
'/build/mobile/remoteautomation.py',
'/build/pgo/server-locations.txt',
'/testing/mochitest/server.js',
'b2g_start_script.js',
'gaia_lock_screen.js',
'output.py',
'reftest-preferences.js',
'reftestcommandline.py',
'remotereftest.py',
'runreftest.py',
'runreftestb2g.py',
'runreftestmulet.py',
]

5
toolkit/crashreporter/client/Makefile.in
View File

@ -18,8 +18,3 @@ libs::
$(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS
$(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS
endif
ifeq (,$(filter-out Linux SunOS,$(OS_ARCH)))
libs:: $(topsrcdir)/toolkit/themes/windows/global/throbber/Throbber-small.gif
$(INSTALL) $^ $(DIST)/bin
endif

5
toolkit/crashreporter/client/moz.build
View File

@ -63,6 +63,11 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
CXXFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['MOZ_GTHREAD_CFLAGS']
if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'SunOS':
FINAL_TARGET_FILES += [
'/toolkit/themes/windows/global/throbber/Throbber-small.gif',
]
RCINCLUDE = 'crashreporter.rc'
# Don't use the STL wrappers in the crashreporter clients; they don't

6
toolkit/mozapps/update/updater/Makefile.in
View File

@ -15,12 +15,6 @@ endif
include $(topsrcdir)/config/rules.mk
ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
libs:: updater.png
$(NSINSTALL) -D $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
libs::
$(NSINSTALL) -D $(DIST)/bin/updater.app

3
toolkit/mozapps/update/updater/moz.build
View File

@ -45,3 +45,6 @@ else:
secondary_cert.inputs += ['dep2.der']
xpcshell_cert.inputs += ['xpcshellCertificate.der']
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
FINAL_TARGET_FILES.icons += ['updater.png']

11
uriloader/exthandler/tests/Makefile.in
View File

@ -1,11 +0,0 @@
# 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/.
include $(topsrcdir)/config/rules.mk
# need the executable for running the xpcshell unit tests
ifneq (,$(SIMPLE_PROGRAMS))
libs::
$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
endif

5
uriloader/exthandler/tests/moz.build
View File

@ -22,3 +22,8 @@ GeckoSimplePrograms([
USE_LIBS += [
'nspr',
]
if CONFIG['COMPILE_ENVIRONMENT']:
TEST_HARNESS_FILES.xpcshell.uriloader.exthandler.tests.unit += [
'!WriteArgument%s' % CONFIG['BIN_SUFFIX'],
]

8
xpcom/tests/Makefile.in
View File

@ -7,14 +7,6 @@ MOZ_DEBUG_SYMBOLS = 1
include $(topsrcdir)/config/rules.mk
ifneq (,$(SIMPLE_PROGRAMS))
libs::
$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
endif
libs::
$(INSTALL) $(DIST)/bin/components/xpcomtest.xpt $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
ifeq (,$(filter-out WINNT, $(HOST_OS_ARCH)))
getnativepath = $(call normalizepath,$(1))
else

8
xpcom/tests/moz.build
View File

@ -71,6 +71,14 @@ if CONFIG['MOZ_MEMORY']:
'TestJemalloc',
])
if CONFIG['COMPILE_ENVIRONMENT']:
TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
'!%s%s' % (f, CONFIG['BIN_SUFFIX']) for f in sorted(SIMPLE_PROGRAMS + CPP_UNIT_TESTS)
]
TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
'!/dist/bin/components/xpcomtest.xpt',
]
# FIXME: bug 577500 TestStaticAtoms fails when run in dist/bin
#CPP_UNIT_TESTS += [
# 'TestStaticAtoms',